traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Martin Panter 2016-11-20 07:56:37 +00:00
parent 1016b2ff00
commit 395733d46b
6 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.pre.in
View File

@ -1418,7 +1418,7 @@ libainstall: all python-config
$(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix \ $(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix \
$(DESTDIR)$(LIBPL)/makexp_aix; \ $(DESTDIR)$(LIBPL)/makexp_aix; \
echo "$(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; \ $(DESTDIR)$(LIBPL)/ld_so_aix; \
echo "$(LIBPL)/ld_so_aix"; \ echo "$(LIBPL)/ld_so_aix"; \
echo; echo "See Misc/AIX-NOTES for details."; \ echo; echo "See Misc/AIX-NOTES for details."; \

2
Misc/ACKS
View File

@ -225,6 +225,7 @@ Arnaud Calmettes
Daniel Calvelo Daniel Calvelo
Tony Campbell Tony Campbell
Brett Cannon Brett Cannon
Tristan Carel
Mike Carlton Mike Carlton
Pierre Carrier Pierre Carrier
Terry Carroll Terry Carroll
@ -573,6 +574,7 @@ Travis B. Hartwell
Larry Hastings Larry Hastings
Tim Hatch Tim Hatch
Shane Hathaway Shane Hathaway
Michael Haubenwallner
Janko Hauser Janko Hauser
Rycharde Hawkes Rycharde Hawkes
Ben Hayden Ben Hayden

3
Misc/NEWS
View File

@ -555,6 +555,9 @@ Windows
Build 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 #26359: Rename --with-optimiations to --enable-optimizations.
- Issue #28444: Fix missing extensions modules when cross compiling. - Issue #28444: Fix missing extensions modules when cross compiling.

1
Modules/ld_so_aix.in
View File

@ -70,6 +70,7 @@ if test ! -n "$*"; then
fi fi
makexp=`dirname $0`/makexp_aix makexp=`dirname $0`/makexp_aix
test -x "${makexp}" || makexp="@abs_srcdir@/makexp_aix"
# Check for existence of compiler. # Check for existence of compiler.
CC=$1; shift CC=$1; shift

2
configure vendored
View File

@ -9226,7 +9226,7 @@ if test -z "$LDSHARED"
then then
case $ac_sys_system/$ac_sys_release in case $ac_sys_system/$ac_sys_release in
AIX*) 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" LDSHARED="\$(LIBPL)/ld_so_aix \$(CC) -bI:\$(LIBPL)/python.exp"
;; ;;
IRIX/5*) LDSHARED="ld -shared";; IRIX/5*) LDSHARED="ld -shared";;

2
configure.ac
View File

@ -2358,7 +2358,7 @@ if test -z "$LDSHARED"
then then
case $ac_sys_system/$ac_sys_release in case $ac_sys_system/$ac_sys_release in
AIX*) 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" LDSHARED="\$(LIBPL)/ld_so_aix \$(CC) -bI:\$(LIBPL)/python.exp"
;; ;;
IRIX/5*) LDSHARED="ld -shared";; IRIX/5*) LDSHARED="ld -shared";;