[Python-checkins] cpython (merge 3.6 -> default): Issue #10656: Merge AIX build fix from 3.6
martin.panter
python-checkins at python.org
Sun Nov 20 18:24:10 EST 2016
https://hg.python.org/cpython/rev/180f046b597e
changeset: 105244:180f046b597e
parent: 105237:2d1d70b53376
parent: 105241:76d1f8001e27
user: Martin Panter <vadmium+py at gmail.com>
date: Sun Nov 20 22:16:46 2016 +0000
summary:
Issue #10656: Merge AIX build fix from 3.6
files:
Makefile.pre.in | 2 +-
Misc/ACKS | 2 ++
Misc/NEWS | 3 +++
Modules/ld_so_aix.in | 1 +
configure | 2 +-
configure.ac | 2 +-
6 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1421,7 +1421,7 @@
$(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix \
$(DESTDIR)$(LIBPL)/makexp_aix; \
echo "$(LIBPL)/makexp_aix"; \
- $(INSTALL_SCRIPT) $(srcdir)/Modules/ld_so_aix \
+ $(INSTALL_SCRIPT) Modules/ld_so_aix \
$(DESTDIR)$(LIBPL)/ld_so_aix; \
echo "$(LIBPL)/ld_so_aix"; \
echo; echo "See Misc/AIX-NOTES for details."; \
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -227,6 +227,7 @@
Daniel Calvelo
Tony Campbell
Brett Cannon
+Tristan Carel
Mike Carlton
Pierre Carrier
Terry Carroll
@@ -582,6 +583,7 @@
Larry Hastings
Tim Hatch
Shane Hathaway
+Michael Haubenwallner
Janko Hauser
Rycharde Hawkes
Ben Hayden
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -425,6 +425,9 @@
Build
-----
+- Issue #10656: Fix out-of-tree building on AIX. Patch by Tristan Carel and
+ Michael Haubenwallner.
+
- Issue #26359: Rename --with-optimiations to --enable-optimizations.
- Issue #28444: Fix missing extensions modules when cross compiling.
diff --git a/Modules/ld_so_aix.in b/Modules/ld_so_aix.in
--- a/Modules/ld_so_aix.in
+++ b/Modules/ld_so_aix.in
@@ -70,6 +70,7 @@
fi
makexp=`dirname $0`/makexp_aix
+test -x "${makexp}" || makexp="@abs_srcdir@/makexp_aix"
# Check for existence of compiler.
CC=$1; shift
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -9165,7 +9165,7 @@
then
case $ac_sys_system/$ac_sys_release in
AIX*)
- BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp"
+ BLDSHARED="Modules/ld_so_aix \$(CC) -bI:Modules/python.exp"
LDSHARED="\$(LIBPL)/ld_so_aix \$(CC) -bI:\$(LIBPL)/python.exp"
;;
IRIX/5*) LDSHARED="ld -shared";;
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2409,7 +2409,7 @@
then
case $ac_sys_system/$ac_sys_release in
AIX*)
- BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp"
+ BLDSHARED="Modules/ld_so_aix \$(CC) -bI:Modules/python.exp"
LDSHARED="\$(LIBPL)/ld_so_aix \$(CC) -bI:\$(LIBPL)/python.exp"
;;
IRIX/5*) LDSHARED="ld -shared";;
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list