Imported Upstream version 6.10.0.101
Former-commit-id: 83a210db4e58bb87425f179b210ee9c1914ac787
This commit is contained in:
parent
ce8084efdb
commit
90df1c4a6a
@ -385,6 +385,11 @@ PIDTYPE = @PIDTYPE@
|
|||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
||||||
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
||||||
|
PYTHON = @PYTHON@
|
||||||
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
PYTHON_VERSION = @PYTHON_VERSION@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
RID = @RID@
|
RID = @RID@
|
||||||
SEARCHSEP = @SEARCHSEP@
|
SEARCHSEP = @SEARCHSEP@
|
||||||
@ -472,9 +477,13 @@ mono_runtime = @mono_runtime@
|
|||||||
mono_runtime_wrapper = @mono_runtime_wrapper@
|
mono_runtime_wrapper = @mono_runtime_wrapper@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
|
pkgpyexecdir = @pkgpyexecdir@
|
||||||
|
pkgpythondir = @pkgpythondir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
psdir = @psdir@
|
psdir = @psdir@
|
||||||
|
pyexecdir = @pyexecdir@
|
||||||
|
pythondir = @pythondir@
|
||||||
reloc_libdir = @reloc_libdir@
|
reloc_libdir = @reloc_libdir@
|
||||||
runstatedir = @runstatedir@
|
runstatedir = @runstatedir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
|
@ -1 +1 @@
|
|||||||
02cf22b1a6f1207be80708fb28fb3494df2dac7d
|
a1910ea7fa5f93873a406165ad72ebe1d0540f58
|
235
aclocal.m4
vendored
235
aclocal.m4
vendored
@ -885,6 +885,241 @@ AC_LANG_POP([C])])
|
|||||||
# For backward compatibility.
|
# For backward compatibility.
|
||||||
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
|
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
|
||||||
|
|
||||||
|
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||||
|
#
|
||||||
|
# This file is free software; the Free Software Foundation
|
||||||
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
|
# with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
|
||||||
|
# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Adds support for distributing Python modules and packages. To
|
||||||
|
# install modules, copy them to $(pythondir), using the python_PYTHON
|
||||||
|
# automake variable. To install a package with the same name as the
|
||||||
|
# automake package, install to $(pkgpythondir), or use the
|
||||||
|
# pkgpython_PYTHON automake variable.
|
||||||
|
#
|
||||||
|
# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
|
||||||
|
# locations to install python extension modules (shared libraries).
|
||||||
|
# Another macro is required to find the appropriate flags to compile
|
||||||
|
# extension modules.
|
||||||
|
#
|
||||||
|
# If your package is configured with a different prefix to python,
|
||||||
|
# users will have to add the install directory to the PYTHONPATH
|
||||||
|
# environment variable, or create a .pth file (see the python
|
||||||
|
# documentation for details).
|
||||||
|
#
|
||||||
|
# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
|
||||||
|
# cause an error if the version of python installed on the system
|
||||||
|
# doesn't meet the requirement. MINIMUM-VERSION should consist of
|
||||||
|
# numbers and dots only.
|
||||||
|
AC_DEFUN([AM_PATH_PYTHON],
|
||||||
|
[
|
||||||
|
dnl Find a Python interpreter. Python versions prior to 2.0 are not
|
||||||
|
dnl supported. (2.0 was released on October 16, 2000).
|
||||||
|
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
|
||||||
|
[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
|
||||||
|
python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
|
||||||
|
|
||||||
|
AC_ARG_VAR([PYTHON], [the Python interpreter])
|
||||||
|
|
||||||
|
m4_if([$1],[],[
|
||||||
|
dnl No version check is needed.
|
||||||
|
# Find any Python interpreter.
|
||||||
|
if test -z "$PYTHON"; then
|
||||||
|
AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
|
||||||
|
fi
|
||||||
|
am_display_PYTHON=python
|
||||||
|
], [
|
||||||
|
dnl A version check is needed.
|
||||||
|
if test -n "$PYTHON"; then
|
||||||
|
# If the user set $PYTHON, use it and don't search something else.
|
||||||
|
AC_MSG_CHECKING([whether $PYTHON version is >= $1])
|
||||||
|
AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
|
||||||
|
[AC_MSG_RESULT([yes])],
|
||||||
|
[AC_MSG_RESULT([no])
|
||||||
|
AC_MSG_ERROR([Python interpreter is too old])])
|
||||||
|
am_display_PYTHON=$PYTHON
|
||||||
|
else
|
||||||
|
# Otherwise, try each interpreter until we find one that satisfies
|
||||||
|
# VERSION.
|
||||||
|
AC_CACHE_CHECK([for a Python interpreter with version >= $1],
|
||||||
|
[am_cv_pathless_PYTHON],[
|
||||||
|
for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
|
||||||
|
test "$am_cv_pathless_PYTHON" = none && break
|
||||||
|
AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
|
||||||
|
done])
|
||||||
|
# Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
|
||||||
|
if test "$am_cv_pathless_PYTHON" = none; then
|
||||||
|
PYTHON=:
|
||||||
|
else
|
||||||
|
AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
|
||||||
|
fi
|
||||||
|
am_display_PYTHON=$am_cv_pathless_PYTHON
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
if test "$PYTHON" = :; then
|
||||||
|
dnl Run any user-specified action, or abort.
|
||||||
|
m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
|
||||||
|
else
|
||||||
|
|
||||||
|
dnl Query Python for its version number. Getting [:3] seems to be
|
||||||
|
dnl the best way to do this; it's what "site.py" does in the standard
|
||||||
|
dnl library.
|
||||||
|
|
||||||
|
AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
|
||||||
|
[am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
|
||||||
|
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
|
||||||
|
|
||||||
|
dnl Use the values of $prefix and $exec_prefix for the corresponding
|
||||||
|
dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
|
||||||
|
dnl distinct variables so they can be overridden if need be. However,
|
||||||
|
dnl general consensus is that you shouldn't need this ability.
|
||||||
|
|
||||||
|
AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
|
||||||
|
AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
|
||||||
|
|
||||||
|
dnl At times (like when building shared libraries) you may want
|
||||||
|
dnl to know which OS platform Python thinks this is.
|
||||||
|
|
||||||
|
AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
|
||||||
|
[am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
|
||||||
|
AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
|
||||||
|
|
||||||
|
# Just factor out some code duplication.
|
||||||
|
am_python_setup_sysconfig="\
|
||||||
|
import sys
|
||||||
|
# Prefer sysconfig over distutils.sysconfig, for better compatibility
|
||||||
|
# with python 3.x. See automake bug#10227.
|
||||||
|
try:
|
||||||
|
import sysconfig
|
||||||
|
except ImportError:
|
||||||
|
can_use_sysconfig = 0
|
||||||
|
else:
|
||||||
|
can_use_sysconfig = 1
|
||||||
|
# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
|
||||||
|
# <https://github.com/pypa/virtualenv/issues/118>
|
||||||
|
try:
|
||||||
|
from platform import python_implementation
|
||||||
|
if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7':
|
||||||
|
can_use_sysconfig = 0
|
||||||
|
except ImportError:
|
||||||
|
pass"
|
||||||
|
|
||||||
|
dnl Set up 4 directories:
|
||||||
|
|
||||||
|
dnl pythondir -- where to install python scripts. This is the
|
||||||
|
dnl site-packages directory, not the python standard library
|
||||||
|
dnl directory like in previous automake betas. This behavior
|
||||||
|
dnl is more consistent with lispdir.m4 for example.
|
||||||
|
dnl Query distutils for this directory.
|
||||||
|
AC_CACHE_CHECK([for $am_display_PYTHON script directory],
|
||||||
|
[am_cv_python_pythondir],
|
||||||
|
[if test "x$prefix" = xNONE
|
||||||
|
then
|
||||||
|
am_py_prefix=$ac_default_prefix
|
||||||
|
else
|
||||||
|
am_py_prefix=$prefix
|
||||||
|
fi
|
||||||
|
am_cv_python_pythondir=`$PYTHON -c "
|
||||||
|
$am_python_setup_sysconfig
|
||||||
|
if can_use_sysconfig:
|
||||||
|
sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
|
||||||
|
else:
|
||||||
|
from distutils import sysconfig
|
||||||
|
sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
|
||||||
|
sys.stdout.write(sitedir)"`
|
||||||
|
case $am_cv_python_pythondir in
|
||||||
|
$am_py_prefix*)
|
||||||
|
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
|
||||||
|
am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
case $am_py_prefix in
|
||||||
|
/usr|/System*) ;;
|
||||||
|
*)
|
||||||
|
am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
])
|
||||||
|
AC_SUBST([pythondir], [$am_cv_python_pythondir])
|
||||||
|
|
||||||
|
dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
|
||||||
|
dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
|
||||||
|
dnl more consistent with the rest of automake.
|
||||||
|
|
||||||
|
AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
|
||||||
|
|
||||||
|
dnl pyexecdir -- directory for installing python extension modules
|
||||||
|
dnl (shared libraries)
|
||||||
|
dnl Query distutils for this directory.
|
||||||
|
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
|
||||||
|
[am_cv_python_pyexecdir],
|
||||||
|
[if test "x$exec_prefix" = xNONE
|
||||||
|
then
|
||||||
|
am_py_exec_prefix=$am_py_prefix
|
||||||
|
else
|
||||||
|
am_py_exec_prefix=$exec_prefix
|
||||||
|
fi
|
||||||
|
am_cv_python_pyexecdir=`$PYTHON -c "
|
||||||
|
$am_python_setup_sysconfig
|
||||||
|
if can_use_sysconfig:
|
||||||
|
sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
|
||||||
|
else:
|
||||||
|
from distutils import sysconfig
|
||||||
|
sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
|
||||||
|
sys.stdout.write(sitedir)"`
|
||||||
|
case $am_cv_python_pyexecdir in
|
||||||
|
$am_py_exec_prefix*)
|
||||||
|
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
|
||||||
|
am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
case $am_py_exec_prefix in
|
||||||
|
/usr|/System*) ;;
|
||||||
|
*)
|
||||||
|
am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
])
|
||||||
|
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
|
||||||
|
|
||||||
|
dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
|
||||||
|
|
||||||
|
AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
|
||||||
|
|
||||||
|
dnl Run any user-specified action.
|
||||||
|
$2
|
||||||
|
fi
|
||||||
|
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
|
||||||
|
# Run ACTION-IF-FALSE otherwise.
|
||||||
|
# This test uses sys.hexversion instead of the string equivalent (first
|
||||||
|
# word of sys.version), in order to cope with versions such as 2.2c1.
|
||||||
|
# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
|
||||||
|
AC_DEFUN([AM_PYTHON_CHECK_VERSION],
|
||||||
|
[prog="import sys
|
||||||
|
# split strings by '.' and convert to numeric. Append some zeros
|
||||||
|
# because we need at least 4 digits for the hex conversion.
|
||||||
|
# map returns an iterator in Python 3.0 and a list in 2.x
|
||||||
|
minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
|
||||||
|
minverhex = 0
|
||||||
|
# xrange is not present in Python 3.0 and range returns an iterator
|
||||||
|
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
|
||||||
|
sys.exit(sys.hexversion < minverhex)"
|
||||||
|
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
|
||||||
|
|
||||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# This file is free software; the Free Software Foundation
|
# This file is free software; the Free Software Foundation
|
||||||
|
@ -1 +1 @@
|
|||||||
efd87e3ac323a294176585423f9049a4265e0532
|
10205f3179b20250f477d9ea3a2ab3191b68d392
|
@ -1 +1 @@
|
|||||||
590028b41f05607587bb461b1826400fc5f72e20
|
59cb6ba7455d64c1f53433f002dc1d06f5536a9a
|
@ -407,6 +407,11 @@ PIDTYPE = @PIDTYPE@
|
|||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
||||||
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
||||||
|
PYTHON = @PYTHON@
|
||||||
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
PYTHON_VERSION = @PYTHON_VERSION@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
RID = @RID@
|
RID = @RID@
|
||||||
SEARCHSEP = @SEARCHSEP@
|
SEARCHSEP = @SEARCHSEP@
|
||||||
@ -494,9 +499,13 @@ mono_runtime = @mono_runtime@
|
|||||||
mono_runtime_wrapper = @mono_runtime_wrapper@
|
mono_runtime_wrapper = @mono_runtime_wrapper@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
|
pkgpyexecdir = @pkgpyexecdir@
|
||||||
|
pkgpythondir = @pkgpythondir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
psdir = @psdir@
|
psdir = @psdir@
|
||||||
|
pyexecdir = @pyexecdir@
|
||||||
|
pythondir = @pythondir@
|
||||||
reloc_libdir = @reloc_libdir@
|
reloc_libdir = @reloc_libdir@
|
||||||
runstatedir = @runstatedir@
|
runstatedir = @runstatedir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
|
@ -328,6 +328,11 @@ PIDTYPE = @PIDTYPE@
|
|||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
||||||
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
||||||
|
PYTHON = @PYTHON@
|
||||||
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
PYTHON_VERSION = @PYTHON_VERSION@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
RID = @RID@
|
RID = @RID@
|
||||||
SEARCHSEP = @SEARCHSEP@
|
SEARCHSEP = @SEARCHSEP@
|
||||||
@ -415,9 +420,13 @@ mono_runtime = @mono_runtime@
|
|||||||
mono_runtime_wrapper = @mono_runtime_wrapper@
|
mono_runtime_wrapper = @mono_runtime_wrapper@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
|
pkgpyexecdir = @pkgpyexecdir@
|
||||||
|
pkgpythondir = @pkgpythondir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
psdir = @psdir@
|
psdir = @psdir@
|
||||||
|
pyexecdir = @pyexecdir@
|
||||||
|
pythondir = @pythondir@
|
||||||
reloc_libdir = @reloc_libdir@
|
reloc_libdir = @reloc_libdir@
|
||||||
runstatedir = @runstatedir@
|
runstatedir = @runstatedir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
|
@ -388,6 +388,11 @@ PIDTYPE = @PIDTYPE@
|
|||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
||||||
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
||||||
|
PYTHON = @PYTHON@
|
||||||
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
PYTHON_VERSION = @PYTHON_VERSION@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
RID = @RID@
|
RID = @RID@
|
||||||
SEARCHSEP = @SEARCHSEP@
|
SEARCHSEP = @SEARCHSEP@
|
||||||
@ -475,9 +480,13 @@ mono_runtime = @mono_runtime@
|
|||||||
mono_runtime_wrapper = @mono_runtime_wrapper@
|
mono_runtime_wrapper = @mono_runtime_wrapper@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
|
pkgpyexecdir = @pkgpyexecdir@
|
||||||
|
pkgpythondir = @pkgpythondir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
psdir = @psdir@
|
psdir = @psdir@
|
||||||
|
pyexecdir = @pyexecdir@
|
||||||
|
pythondir = @pythondir@
|
||||||
reloc_libdir = @reloc_libdir@
|
reloc_libdir = @reloc_libdir@
|
||||||
runstatedir = @runstatedir@
|
runstatedir = @runstatedir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
|
@ -328,6 +328,11 @@ PIDTYPE = @PIDTYPE@
|
|||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
||||||
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
||||||
|
PYTHON = @PYTHON@
|
||||||
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
PYTHON_VERSION = @PYTHON_VERSION@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
RID = @RID@
|
RID = @RID@
|
||||||
SEARCHSEP = @SEARCHSEP@
|
SEARCHSEP = @SEARCHSEP@
|
||||||
@ -415,9 +420,13 @@ mono_runtime = @mono_runtime@
|
|||||||
mono_runtime_wrapper = @mono_runtime_wrapper@
|
mono_runtime_wrapper = @mono_runtime_wrapper@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
|
pkgpyexecdir = @pkgpyexecdir@
|
||||||
|
pkgpythondir = @pkgpythondir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
psdir = @psdir@
|
psdir = @psdir@
|
||||||
|
pyexecdir = @pyexecdir@
|
||||||
|
pythondir = @pythondir@
|
||||||
reloc_libdir = @reloc_libdir@
|
reloc_libdir = @reloc_libdir@
|
||||||
runstatedir = @runstatedir@
|
runstatedir = @runstatedir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
|
@ -388,6 +388,11 @@ PIDTYPE = @PIDTYPE@
|
|||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
||||||
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
||||||
|
PYTHON = @PYTHON@
|
||||||
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
PYTHON_VERSION = @PYTHON_VERSION@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
RID = @RID@
|
RID = @RID@
|
||||||
SEARCHSEP = @SEARCHSEP@
|
SEARCHSEP = @SEARCHSEP@
|
||||||
@ -475,9 +480,13 @@ mono_runtime = @mono_runtime@
|
|||||||
mono_runtime_wrapper = @mono_runtime_wrapper@
|
mono_runtime_wrapper = @mono_runtime_wrapper@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
|
pkgpyexecdir = @pkgpyexecdir@
|
||||||
|
pkgpythondir = @pkgpythondir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
psdir = @psdir@
|
psdir = @psdir@
|
||||||
|
pyexecdir = @pyexecdir@
|
||||||
|
pythondir = @pythondir@
|
||||||
reloc_libdir = @reloc_libdir@
|
reloc_libdir = @reloc_libdir@
|
||||||
runstatedir = @runstatedir@
|
runstatedir = @runstatedir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
|
@ -328,6 +328,11 @@ PIDTYPE = @PIDTYPE@
|
|||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
||||||
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
||||||
|
PYTHON = @PYTHON@
|
||||||
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
PYTHON_VERSION = @PYTHON_VERSION@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
RID = @RID@
|
RID = @RID@
|
||||||
SEARCHSEP = @SEARCHSEP@
|
SEARCHSEP = @SEARCHSEP@
|
||||||
@ -415,9 +420,13 @@ mono_runtime = @mono_runtime@
|
|||||||
mono_runtime_wrapper = @mono_runtime_wrapper@
|
mono_runtime_wrapper = @mono_runtime_wrapper@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
|
pkgpyexecdir = @pkgpyexecdir@
|
||||||
|
pkgpythondir = @pkgpythondir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
psdir = @psdir@
|
psdir = @psdir@
|
||||||
|
pyexecdir = @pyexecdir@
|
||||||
|
pythondir = @pythondir@
|
||||||
reloc_libdir = @reloc_libdir@
|
reloc_libdir = @reloc_libdir@
|
||||||
runstatedir = @runstatedir@
|
runstatedir = @runstatedir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
|
@ -388,6 +388,11 @@ PIDTYPE = @PIDTYPE@
|
|||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
||||||
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
||||||
|
PYTHON = @PYTHON@
|
||||||
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
PYTHON_VERSION = @PYTHON_VERSION@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
RID = @RID@
|
RID = @RID@
|
||||||
SEARCHSEP = @SEARCHSEP@
|
SEARCHSEP = @SEARCHSEP@
|
||||||
@ -475,9 +480,13 @@ mono_runtime = @mono_runtime@
|
|||||||
mono_runtime_wrapper = @mono_runtime_wrapper@
|
mono_runtime_wrapper = @mono_runtime_wrapper@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
|
pkgpyexecdir = @pkgpyexecdir@
|
||||||
|
pkgpythondir = @pkgpythondir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
psdir = @psdir@
|
psdir = @psdir@
|
||||||
|
pyexecdir = @pyexecdir@
|
||||||
|
pythondir = @pythondir@
|
||||||
reloc_libdir = @reloc_libdir@
|
reloc_libdir = @reloc_libdir@
|
||||||
runstatedir = @runstatedir@
|
runstatedir = @runstatedir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
|
@ -329,6 +329,11 @@ PIDTYPE = @PIDTYPE@
|
|||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
||||||
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
||||||
|
PYTHON = @PYTHON@
|
||||||
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
PYTHON_VERSION = @PYTHON_VERSION@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
RID = @RID@
|
RID = @RID@
|
||||||
SEARCHSEP = @SEARCHSEP@
|
SEARCHSEP = @SEARCHSEP@
|
||||||
@ -416,9 +421,13 @@ mono_runtime = @mono_runtime@
|
|||||||
mono_runtime_wrapper = @mono_runtime_wrapper@
|
mono_runtime_wrapper = @mono_runtime_wrapper@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
|
pkgpyexecdir = @pkgpyexecdir@
|
||||||
|
pkgpythondir = @pkgpythondir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
psdir = @psdir@
|
psdir = @psdir@
|
||||||
|
pyexecdir = @pyexecdir@
|
||||||
|
pythondir = @pythondir@
|
||||||
reloc_libdir = @reloc_libdir@
|
reloc_libdir = @reloc_libdir@
|
||||||
runstatedir = @runstatedir@
|
runstatedir = @runstatedir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
|
700
external/bdwgc/autom4te.cache/requests
vendored
700
external/bdwgc/autom4te.cache/requests
vendored
File diff suppressed because it is too large
Load Diff
8
external/bdwgc/config.log
vendored
8
external/bdwgc/config.log
vendored
@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69. Invocation command line was
|
|||||||
## Platform. ##
|
## Platform. ##
|
||||||
## --------- ##
|
## --------- ##
|
||||||
|
|
||||||
hostname = az-ubuntu-general1958b0
|
hostname = az-ubuntu-generalb689d0
|
||||||
uname -m = x86_64
|
uname -m = x86_64
|
||||||
uname -r = 4.15.0-1071-azure
|
uname -r = 4.15.0-1075-azure
|
||||||
uname -s = Linux
|
uname -s = Linux
|
||||||
uname -v = #76-Ubuntu SMP Wed Feb 12 03:02:44 UTC 2020
|
uname -v = #80-Ubuntu SMP Wed Mar 18 13:27:16 UTC 2020
|
||||||
|
|
||||||
/usr/bin/uname -p = unknown
|
/usr/bin/uname -p = unknown
|
||||||
/bin/uname -X = unknown
|
/bin/uname -X = unknown
|
||||||
@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
|
|||||||
CONFIG_COMMANDS =
|
CONFIG_COMMANDS =
|
||||||
$ ./config.status
|
$ ./config.status
|
||||||
|
|
||||||
on az-ubuntu-general1958b0
|
on az-ubuntu-generalb689d0
|
||||||
|
|
||||||
config.status:1238: creating Makefile
|
config.status:1238: creating Makefile
|
||||||
config.status:1238: creating bdw-gc.pc
|
config.status:1238: creating bdw-gc.pc
|
||||||
|
2
external/bdwgc/libtool.REMOVED.git-id
vendored
2
external/bdwgc/libtool.REMOVED.git-id
vendored
@ -1 +1 @@
|
|||||||
667b39ef8fe65d14bf9f50207f4cb4fd6120026d
|
abae4b1e0e194e32e1b1b62dbeefb289666203c5
|
2
external/bockbuild/bockbuild/unixprofile.py
vendored
2
external/bockbuild/bockbuild/unixprofile.py
vendored
@ -24,7 +24,7 @@ class UnixProfile (Profile):
|
|||||||
'%{staged_prefix}/bin',
|
'%{staged_prefix}/bin',
|
||||||
'/usr/bin',
|
'/usr/bin',
|
||||||
'/bin',
|
'/bin',
|
||||||
'/usr/local/git/bin')
|
'/usr/local/bin')
|
||||||
|
|
||||||
self.env.set('C_INCLUDE_PATH', '%{staged_prefix}/include')
|
self.env.set('C_INCLUDE_PATH', '%{staged_prefix}/include')
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ namespace System.IO.Tests
|
|||||||
[PlatformSpecific(TestPlatforms.AnyUnix)] // Expected WatcherChangeTypes are different based on OS
|
[PlatformSpecific(TestPlatforms.AnyUnix)] // Expected WatcherChangeTypes are different based on OS
|
||||||
public void Unix_File_Move_To_Same_Directory()
|
public void Unix_File_Move_To_Same_Directory()
|
||||||
{
|
{
|
||||||
FileMove_SameDirectory(WatcherChangeTypes.Created | WatcherChangeTypes.Deleted);
|
FileMove_SameDirectory(WatcherChangeTypes.Renamed);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
@ -73,7 +73,7 @@ namespace System.IO.Tests
|
|||||||
[PlatformSpecific(TestPlatforms.OSX)] // Expected WatcherChangeTypes are different based on OS
|
[PlatformSpecific(TestPlatforms.OSX)] // Expected WatcherChangeTypes are different based on OS
|
||||||
public void OSX_File_Move_To_Different_Watched_Directory()
|
public void OSX_File_Move_To_Different_Watched_Directory()
|
||||||
{
|
{
|
||||||
FileMove_DifferentWatchedDirectory(WatcherChangeTypes.Changed);
|
FileMove_DifferentWatchedDirectory(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
@ -104,7 +104,7 @@ namespace System.IO.Tests
|
|||||||
[PlatformSpecific(TestPlatforms.AnyUnix)] // Expected WatcherChangeTypes are different based on OS
|
[PlatformSpecific(TestPlatforms.AnyUnix)] // Expected WatcherChangeTypes are different based on OS
|
||||||
public void Unix_File_Move_In_Nested_Directory(bool includeSubdirectories)
|
public void Unix_File_Move_In_Nested_Directory(bool includeSubdirectories)
|
||||||
{
|
{
|
||||||
FileMove_NestedDirectory(includeSubdirectories ? WatcherChangeTypes.Created | WatcherChangeTypes.Deleted : 0, includeSubdirectories);
|
FileMove_NestedDirectory(includeSubdirectories ? WatcherChangeTypes.Renamed : 0, includeSubdirectories);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
@ -118,7 +118,7 @@ namespace System.IO.Tests
|
|||||||
[PlatformSpecific(TestPlatforms.AnyUnix)] // Expected WatcherChangeTypes are different based on OS
|
[PlatformSpecific(TestPlatforms.AnyUnix)] // Expected WatcherChangeTypes are different based on OS
|
||||||
public void Unix_File_Move_With_Set_NotifyFilter()
|
public void Unix_File_Move_With_Set_NotifyFilter()
|
||||||
{
|
{
|
||||||
FileMove_WithNotifyFilter(WatcherChangeTypes.Deleted);
|
FileMove_WithNotifyFilter(WatcherChangeTypes.Renamed);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Test Helpers
|
#region Test Helpers
|
||||||
|
@ -160,18 +160,19 @@ namespace System.IO
|
|||||||
{
|
{
|
||||||
// The desired behavior for Move(source, dest) is to not overwrite the destination file
|
// The desired behavior for Move(source, dest) is to not overwrite the destination file
|
||||||
// if it exists. Since rename(source, dest) will replace the file at 'dest' if it exists,
|
// if it exists. Since rename(source, dest) will replace the file at 'dest' if it exists,
|
||||||
// link/unlink are used instead. However, if the source path and the dest path refer to
|
// link/unlink are used instead. Rename is more efficient than link/unlink on file systems
|
||||||
// the same file, then do a rename rather than a link and an unlink. This is important
|
// where hard links are not supported (such as FAT). Therefore, given that source file exists,
|
||||||
// for case-insensitive file systems (e.g. renaming a file in a way that just changes casing),
|
// rename is used in 2 cases: when dest file does not exist or when source path and dest
|
||||||
// so that we support changing the casing in the naming of the file. If this fails in any
|
// path refer to the same file (on the same device). This is important for case-insensitive
|
||||||
// way (e.g. source file doesn't exist, dest file doesn't exist, rename fails, etc.), we
|
// file systems (e.g. renaming a file in a way that just changes casing), so that we support
|
||||||
// just fall back to trying the link/unlink approach and generating any exceptional messages
|
// changing the casing in the naming of the file. If this fails in any way (e.g. source file
|
||||||
// from there as necessary.
|
// doesn't exist, dest file doesn't exist, rename fails, etc.), we just fall back to trying the
|
||||||
|
// link/unlink approach and generating any exceptional messages from there as necessary.
|
||||||
Interop.Sys.FileStatus sourceStat, destStat;
|
Interop.Sys.FileStatus sourceStat, destStat;
|
||||||
if (Interop.Sys.LStat(sourceFullPath, out sourceStat) == 0 && // source file exists
|
if (Interop.Sys.LStat(sourceFullPath, out sourceStat) == 0 && // source file exists
|
||||||
Interop.Sys.LStat(destFullPath, out destStat) == 0 && // dest file exists
|
(Interop.Sys.LStat(destFullPath, out destStat) != 0 || // dest file does not exist
|
||||||
sourceStat.Dev == destStat.Dev && // source and dest are on the same device
|
(sourceStat.Dev == destStat.Dev && // source and dest are on the same device
|
||||||
sourceStat.Ino == destStat.Ino && // and source and dest are the same file on that device
|
sourceStat.Ino == destStat.Ino)) && // source and dest are the same file on that device
|
||||||
Interop.Sys.Rename(sourceFullPath, destFullPath) == 0) // try the rename
|
Interop.Sys.Rename(sourceFullPath, destFullPath) == 0) // try the rename
|
||||||
{
|
{
|
||||||
// Renamed successfully.
|
// Renamed successfully.
|
||||||
|
@ -376,6 +376,11 @@ PIDTYPE = @PIDTYPE@
|
|||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
|
||||||
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
|
||||||
|
PYTHON = @PYTHON@
|
||||||
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
PYTHON_VERSION = @PYTHON_VERSION@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
RID = @RID@
|
RID = @RID@
|
||||||
SEARCHSEP = @SEARCHSEP@
|
SEARCHSEP = @SEARCHSEP@
|
||||||
@ -463,9 +468,13 @@ mono_runtime = @mono_runtime@
|
|||||||
mono_runtime_wrapper = @mono_runtime_wrapper@
|
mono_runtime_wrapper = @mono_runtime_wrapper@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
pdfdir = @pdfdir@
|
||||||
|
pkgpyexecdir = @pkgpyexecdir@
|
||||||
|
pkgpythondir = @pkgpythondir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
psdir = @psdir@
|
psdir = @psdir@
|
||||||
|
pyexecdir = @pyexecdir@
|
||||||
|
pythondir = @pythondir@
|
||||||
reloc_libdir = @reloc_libdir@
|
reloc_libdir = @reloc_libdir@
|
||||||
runstatedir = @runstatedir@
|
runstatedir = @runstatedir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user