[Python-checkins] cpython (2.7): Issue #10656: Fix out-of-tree building on AIX

Sun Nov 20 18:24:10 EST 2016

https://hg.python.org/cpython/rev/ca46883fc5cf
changeset: 105248:ca46883fc5cf
branch: 2.7
user: Martin Panter <vadmium+py at gmail.com>
date: Sun Nov 20 09:31:41 2016 +0000
summary:
 Issue #10656: Fix out-of-tree building on AIX
The ld_so_aix script and python.exp file are created in the build directory.
Patch by Tristan Carel and Michael Haubenwallner.
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
@@ -1232,7 +1232,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
@@ -209,6 +209,7 @@
 Daniel Calvelo
 Tony Campbell
 Brett Cannon
+Tristan Carel
 Mike Carlton
 Pierre Carrier
 Terry Carroll
@@ -541,6 +542,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
@@ -273,6 +273,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 #28248: Update Windows build and OS X installers to use OpenSSL 1.0.2j.
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
@@ -8551,7 +8551,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="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
 		;;
 	BeOS*)
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2124,7 +2124,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="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
 		;;
 	BeOS*)
-- 
Repository URL: https://hg.python.org/cpython
