diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-11-20 22:06:44 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-11-20 22:06:44 (GMT) |
| commit | e45df0a6dada198123264acc513ce471d681751d (patch) | |
| tree | cdec608206519e8d67ac3fd0928a6a95e22b69e8 | |
| parent | 57ea576b072ec9ad1c70ce7dd0eabf230ad4b644 (diff) | |
| parent | 395733d46bbc23d2f559eba4e5f75783f9bca6f1 (diff) | |
| download | cpython-e45df0a6dada198123264acc513ce471d681751d.zip cpython-e45df0a6dada198123264acc513ce471d681751d.tar.gz cpython-e45df0a6dada198123264acc513ce471d681751d.tar.bz2 | |
Issue #10656: Merge AIX build fix from 3.5
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Misc/ACKS | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/ld_so_aix.in | 1 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
6 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 5190436..cd7d33d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1421,7 +1421,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."; \ @@ -227,6 +227,7 @@ Arnaud Calmettes Daniel Calvelo Tony Campbell Brett Cannon +Tristan Carel Mike Carlton Pierre Carrier Terry Carroll @@ -581,6 +582,7 @@ Travis B. Hartwell Larry Hastings Tim Hatch Shane Hathaway +Michael Haubenwallner Janko Hauser Rycharde Hawkes Ben Hayden @@ -90,6 +90,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 #28676: Prevent missing 'getentropy' declaration warning on macOS. diff --git a/Modules/ld_so_aix.in b/Modules/ld_so_aix.in index add6b3e..f4eab40 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 @@ -9165,7 +9165,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 d4f71aa..1d63813 100644 --- a/configure.ac +++ b/configure.ac @@ -2409,7 +2409,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";; |