changeset:   105244:180f046b597e
parent:      105237:2d1d70b53376
parent:      105241:76d1f8001e27
user:        Martin Panter <vadmium+py@gmail.com>
date:        Sun Nov 20 22:16:46 2016 +0000
files:       Makefile.pre.in Misc/ACKS Misc/NEWS configure configure.ac
description:
Issue #10656: Merge AIX build fix from 3.6


diff -r 2d1d70b53376 -r 180f046b597e Makefile.pre.in
--- a/Makefile.pre.in	Sun Nov 20 21:17:23 2016 +0000
+++ b/Makefile.pre.in	Sun Nov 20 22:16:46 2016 +0000
@@ -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 -r 2d1d70b53376 -r 180f046b597e Misc/ACKS
--- a/Misc/ACKS	Sun Nov 20 21:17:23 2016 +0000
+++ b/Misc/ACKS	Sun Nov 20 22:16:46 2016 +0000
@@ -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 -r 2d1d70b53376 -r 180f046b597e Misc/NEWS
--- a/Misc/NEWS	Sun Nov 20 21:17:23 2016 +0000
+++ b/Misc/NEWS	Sun Nov 20 22:16:46 2016 +0000
@@ -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 -r 2d1d70b53376 -r 180f046b597e Modules/ld_so_aix.in
--- a/Modules/ld_so_aix.in	Sun Nov 20 21:17:23 2016 +0000
+++ b/Modules/ld_so_aix.in	Sun Nov 20 22:16:46 2016 +0000
@@ -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 -r 2d1d70b53376 -r 180f046b597e configure
--- a/configure	Sun Nov 20 21:17:23 2016 +0000
+++ b/configure	Sun Nov 20 22:16:46 2016 +0000
@@ -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 -r 2d1d70b53376 -r 180f046b597e configure.ac
--- a/configure.ac	Sun Nov 20 21:17:23 2016 +0000
+++ b/configure.ac	Sun Nov 20 22:16:46 2016 +0000
@@ -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";;