changeset:   102926:ca1ddd365f5f
branch:      3.5
user:        Martin Panter <vadmium+py@gmail.com>
date:        Sat Aug 27 04:00:19 2016 +0000
files:       Misc/NEWS configure configure.ac
description:
Issue #25825: Fix references to $(LIBPL) installation path on AIX

In Subversion r86731, the path was changed from $(BINLIBDEST)/config to
$(LIBDEST)/config-$(LDVERSION).


diff -r 782d9b5d2e90 -r ca1ddd365f5f Misc/NEWS
--- a/Misc/NEWS	Sat Aug 27 03:23:11 2016 +0000
+++ b/Misc/NEWS	Sat Aug 27 04:00:19 2016 +0000
@@ -220,8 +220,10 @@
 - Issue #27713: Suppress spurious build warnings when updating importlib's
   bootstrap files.  Patch by Xiang Zhang
 
-- Issue #25825: Correct the references to Modules/python.exp, which is
-  required on AIX.  The references were accidentally changed in 3.5.0a1.
+- Issue #25825: Correct the references to Modules/python.exp and ld_so_aix,
+  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
   Chi Hsuan Yen.
diff -r 782d9b5d2e90 -r ca1ddd365f5f configure
--- a/configure	Sat Aug 27 03:23:11 2016 +0000
+++ b/configure	Sat Aug 27 04:00:19 2016 +0000
@@ -9040,7 +9040,7 @@
 	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 -r 782d9b5d2e90 -r ca1ddd365f5f configure.ac
--- a/configure.ac	Sat Aug 27 03:23:11 2016 +0000
+++ b/configure.ac	Sat Aug 27 04:00:19 2016 +0000
@@ -2284,7 +2284,7 @@
 	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";;