From: Martin Panter <vadmium+py@gmail.com>
Date: Sat, 27 Aug 2016 04:00:19 +0000 (+0000)
Subject: Issue #25825: Fix references to $(LIBPL) installation path on AIX
X-Git-Tag: v3.6.0b1~538^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5de141f157ab372f5dd5b28c17442e41e15101af;p=thirdparty%2FPython%2Fcpython.git

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 --git a/Misc/NEWS b/Misc/NEWS
index 290cf867fa4b..e85587ef20d1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -220,8 +220,10 @@ Build
 - 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 --git a/configure b/configure
index d45dd6546f11..f5ff3cea448b 100755
--- a/configure
+++ b/configure
@@ -9040,7 +9040,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 11acb0ac7820..2ccb4e2df691 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2284,7 +2284,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";;