Commit 4321db20 authored by Martin Panter's avatar Martin Panter

Issue #10656: Merge AIX build fix from 3.5

parents bb977f50 8305b833
...@@ -1421,7 +1421,7 @@ libainstall: all python-config ...@@ -1421,7 +1421,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."; \
......
...@@ -227,6 +227,7 @@ Arnaud Calmettes ...@@ -227,6 +227,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
...@@ -581,6 +582,7 @@ Travis B. Hartwell ...@@ -581,6 +582,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
......
...@@ -90,6 +90,9 @@ Tests ...@@ -90,6 +90,9 @@ Tests
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 #28676: Prevent missing 'getentropy' declaration warning on macOS. - Issue #28676: Prevent missing 'getentropy' declaration warning on macOS.
......
...@@ -70,6 +70,7 @@ if test ! -n "$*"; then ...@@ -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
......
...@@ -9165,7 +9165,7 @@ if test -z "$LDSHARED" ...@@ -9165,7 +9165,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";;
......
...@@ -2409,7 +2409,7 @@ if test -z "$LDSHARED" ...@@ -2409,7 +2409,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";;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment