jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branches 'guile-c11' and 'python-ci-fix'

Browse source 
Fix Travis CI builds broken due to the changes in Travis CI build
environment since the last successful build.

See #1798, #1799.
This commit is contained in:
Vadim Zeitlin 2020-05-23 02:35:31 +02:00
commit f422302c7b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/test-suite/python/Makefile.in
View file

@ -11,7 +11,7 @@ endif
LANGUAGE = python LANGUAGE = python
PYTHON = $(PYBIN) PYTHON = $(PYBIN)
PYCODESTYLE = @PYCODESTYLE@ PYCODESTYLE = @PYCODESTYLE@
PYCODESTYLE_FLAGS = --ignore=E252,E30,E402,E501,E731,W291,W391 PYCODESTYLE_FLAGS = --ignore=E252,E30,E402,E501,E731,E741,W291,W391
#*_runme.py for Python 2.x, *_runme3.py for Python 3.x #*_runme.py for Python 2.x, *_runme3.py for Python 3.x
PY2SCRIPTSUFFIX = _runme.py PY2SCRIPTSUFFIX = _runme.py

6
configure.ac
View file

@ -622,7 +622,7 @@ else
PYEPREFIX=`($PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)") 2>/dev/null` PYEPREFIX=`($PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)") 2>/dev/null`
AC_MSG_RESULT($PYEPREFIX) AC_MSG_RESULT($PYEPREFIX)
if test x"$PYOSNAME" = x"nt" -a x"$PYSEPARATOR" = x"\\"; then if test x"$PYOSNAME" = x"nt" -a x"$PYSEPARATOR" = x'\\'; then
# Windows installations are quite different to posix installations (MinGW path separator is a forward slash) # Windows installations are quite different to posix installations (MinGW path separator is a forward slash)
PYPREFIX=`echo "$PYPREFIX" | sed -e 's,\\\\,/,g'` # Forward slashes are easier to use and even work on Windows most of the time PYPREFIX=`echo "$PYPREFIX" | sed -e 's,\\\\,/,g'` # Forward slashes are easier to use and even work on Windows most of the time
PYTHON_SO=.pyd PYTHON_SO=.pyd
@ -739,7 +739,7 @@ else
PYVER=0 PYVER=0
fi fi
if test "x$PY3BIN" = xyes; then if test "x$PY3BIN" = xyes; then
if test x"$PYOSNAME" = x"nt" -a x"$PYSEPARATOR" = x"\\" -a $PYVER -ge 3; then if test x"$PYOSNAME" = x"nt" -a x"$PYSEPARATOR" = x'\\' -a $PYVER -ge 3; then
PYTHON3="$PYTHON" PYTHON3="$PYTHON"
else else
for py_ver in 3 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 ""; do for py_ver in 3 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 ""; do
@ -774,7 +774,7 @@ else
PYSEPARATOR=`($PYTHON3 -c "import sys, os; sys.stdout.write(os.sep)") 2>/dev/null` PYSEPARATOR=`($PYTHON3 -c "import sys, os; sys.stdout.write(os.sep)") 2>/dev/null`
AC_MSG_RESULT($PYSEPARATOR) AC_MSG_RESULT($PYSEPARATOR)
if test x"$PY3OSNAME" = x"nt" -a x"$PYSEPARATOR" = x"\\"; then if test x"$PY3OSNAME" = x"nt" -a x"$PYSEPARATOR" = x'\\'; then
# Windows installations are quite different to posix installations # Windows installations are quite different to posix installations
# There is no python-config to use # There is no python-config to use
AC_MSG_CHECKING(for Python 3.x prefix) AC_MSG_CHECKING(for Python 3.x prefix)