From: Martin Panter Date: Sun, 20 Nov 2016 09:31:41 +0000 (+0000) Subject: Issue #10656: Fix out-of-tree building on AIX X-Git-Tag: v2.7.13rc1~27 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f75a2ebbac3ab4a93856452d5ad843f7d50daaba;p=python 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 f745b15190..e28896406f 100644 --- 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 65fd0dc07a..9cbc230fc0 100644 --- 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 dbcd707239..c89fe7896e 100644 --- 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 c18ff10f24..e8e98b142f 100644 --- 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 4e4f9e3421..c01dfe0f27 100755 --- 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 f6ca54aa46..127346502c 100644 --- 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*)