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.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index ba633da5867822b63b1e8e220d22f8d099957a9d..a88b7d5d959aebc79092f6f5027070257ec7e58b 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1418,7 +1418,7 @@ libainstall:      all python-config
                $(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
index 69dc9f5c0dffb4c2ab0dd19b4e46b6fe7b509432..c8c63f142ca199744bdc1a6dcc7dc02c9889cd6d 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -225,6 +225,7 @@ Arnaud Calmettes
 Daniel Calvelo
 Tony Campbell
 Brett Cannon
+Tristan Carel
 Mike Carlton
 Pierre Carrier
 Terry Carroll
@@ -573,6 +574,7 @@ Travis B. Hartwell
 Larry Hastings
 Tim Hatch
 Shane Hathaway
+Michael Haubenwallner
 Janko Hauser
 Rycharde Hawkes
 Ben Hayden

diff --git a/Misc/NEWS b/Misc/NEWS
index 7c6c158fc7d376a5275f9930596f83bba06a30a7..07576b5ef11c604233a278e94be421562d7d25de 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -555,6 +555,9 @@ Windows
 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
index add6b3efabcd172efd8682a7380f9332f1beb630..f4eab40b6b82193c13822adafe3185ddb6bd0ac0 100644 (file)
--- a/Modules/ld_so_aix.in
+++ b/Modules/ld_so_aix.in
@@ -70,6 +70,7 @@ if test ! -n "$*"; then
 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
index 179c1982aa1a48cca300078c98fc84f9c3c6fb6f..8fcc36f8ef689056d780ef9868d2495940165c24 100755 (executable)
--- a/configure
+++ b/configure
@@ -9226,7 +9226,7 @@ if test -z "$LDSHARED"
 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
index 4e55871772434626447cdf1905773aae254a0386..0886b6e68d78f3101a8fc2510cbe9c13a8105b6c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2358,7 +2358,7 @@ if test -z "$LDSHARED"
 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";;