summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-08-27 04:07:54 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-08-27 04:07:54 (GMT)
commit8c3c52b19f6ded5593cfab1086051cb5f4628434 (patch)
tree7b83c4d22fd0ff899a52ed5aa771a1f8fd87ca02
parentaac9b716329e74f35f981769f1c831f4dfb4b51e (diff)
parent5de141f157ab372f5dd5b28c17442e41e15101af (diff)
downloadcpython-8c3c52b19f6ded5593cfab1086051cb5f4628434.zip
cpython-8c3c52b19f6ded5593cfab1086051cb5f4628434.tar.gz
cpython-8c3c52b19f6ded5593cfab1086051cb5f4628434.tar.bz2
Issue #25825: Merge $(LIBPL) fix from 3.5
-rw-r--r--Misc/NEWS6
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 8 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 2764a91..37c4420 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -89,6 +89,12 @@ Tests
- Issue #27787: Call gc.collect() before checking each test for "dangling
threads", since the dangling threads are weak references.
+Build
+-----
+
+- Issue #25825: Update references to the $(LIBPL) installation path on AIX.
+ This path was changed in 3.2a4.
+
What's New in Python 3.6.0 alpha 4
==================================
diff --git a/configure b/configure
index e06fce4..f5cabad 100755
--- a/configure
+++ b/configure
@@ -9079,7 +9079,7 @@ then
case $ac_sys_system/$ac_sys_release in
AIX*)
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*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
diff --git a/configure.ac b/configure.ac
index a83fe51..64c844d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2315,7 +2315,7 @@ then
case $ac_sys_system/$ac_sys_release in
AIX*)
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*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;