Commit 92bace03 authored by Martin Panter's avatar Martin Panter

Issue #25825: Fix references to $(LIBPL) installation path on AIX

In Subversion r86731, the path was changed from $(BINLIBDEST)/config to
$(LIBDEST)/config-$(LDVERSION).
parent 4aa7e01a
...@@ -220,8 +220,10 @@ Build ...@@ -220,8 +220,10 @@ Build
- Issue #27713: Suppress spurious build warnings when updating importlib's - Issue #27713: Suppress spurious build warnings when updating importlib's
bootstrap files. Patch by Xiang Zhang bootstrap files. Patch by Xiang Zhang
- Issue #25825: Correct the references to Modules/python.exp, which is - Issue #25825: Correct the references to Modules/python.exp and ld_so_aix,
required on AIX. The references were accidentally changed in 3.5.0a1. which are required on AIX. This updates references to an installation path
that was changed in 3.2a4, and undoes changed references to the build tree
that were made in 3.5.0a1.
- Issue #27453: CPP invocation in configure must use CPPFLAGS. Patch by - Issue #27453: CPP invocation in configure must use CPPFLAGS. Patch by
Chi Hsuan Yen. Chi Hsuan Yen.
......
...@@ -9040,7 +9040,7 @@ then ...@@ -9040,7 +9040,7 @@ 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="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp"
LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp" LDSHARED="\$(LIBPL)/ld_so_aix \$(CC) -bI:\$(LIBPL)/python.exp"
;; ;;
IRIX/5*) LDSHARED="ld -shared";; IRIX/5*) LDSHARED="ld -shared";;
IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";; IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
......
...@@ -2284,7 +2284,7 @@ then ...@@ -2284,7 +2284,7 @@ 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="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp"
LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp" LDSHARED="\$(LIBPL)/ld_so_aix \$(CC) -bI:\$(LIBPL)/python.exp"
;; ;;
IRIX/5*) LDSHARED="ld -shared";; IRIX/5*) LDSHARED="ld -shared";;
IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";; IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
......
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