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 f745b15190f8ea244d2e96948130bc8c156fff3f..e28896406f6fcf48c86c8b9acd6db4370c1eda68 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1232,7 +1232,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 65fd0dc07ab5ae63315b3e1204f2f9d0ae8427b2..9cbc230fc068ff507431c3cbf80830c956f95065 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -209,6 +209,7 @@ Arnaud Calmettes
 Daniel Calvelo
 Tony Campbell
 Brett Cannon
+Tristan Carel
 Mike Carlton
 Pierre Carrier
 Terry Carroll
@@ -541,6 +542,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 dbcd707239ff64027009a130c65b4e585d7e4f8b..c89fe7896e6a7ef5cf2d693f940f835ec428369f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -273,6 +273,9 @@ Tests
 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
index c18ff10f24bb4d0c33b9800291c76ad131883c45..e8e98b142faf09609ead9a6cddcf1655dcfe536d 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 4e4f9e342147f85ceeb56eb28083c8008eccfdaa..c01dfe0f27463b64723bb4fd3ddbd275ba37142d 100755 (executable)
--- a/configure
+++ b/configure
@@ -8551,7 +8551,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="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
                ;;
        BeOS*)

diff --git a/configure.ac b/configure.ac
index f6ca54aa46cfa7dd22d5c2bbb95c976d360ba2fe..127346502c3b252ae7994204bc080469a6024fcd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2124,7 +2124,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="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
                ;;
        BeOS*)