diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-11-20 07:56:37 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-11-20 07:56:37 (GMT) |
| commit | 395733d46bbc23d2f559eba4e5f75783f9bca6f1 (patch) | |
| tree | bdc143f8538156bfd53d4a7d81cbd52b9b7f59d1 | |
| parent | 1016b2ff00665203ae01d82520dac497ac89e5e7 (diff) | |
| download | cpython-395733d46bbc23d2f559eba4e5f75783f9bca6f1.zip cpython-395733d46bbc23d2f559eba4e5f75783f9bca6f1.tar.gz cpython-395733d46bbc23d2f559eba4e5f75783f9bca6f1.tar.bz2 | |
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.
| -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 ba633da..a88b7d5 100644 --- 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."; \ @@ -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 @@ -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 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 @@ -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 4e55871..0886b6e 100644 --- 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";; |