From 9a829bed975c30f4420f180baf935717c9416e28 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 15 Feb 2011 15:44:51 +0000
Subject: [PATCH] #941346: Fix broken shared library build on AIX. Patch by
 Sebastien Sable, review by Antoine Pitrou.

---
 Makefile.pre.in      | 2 +-
 Misc/NEWS            | 5 +++++
 Modules/ld_so_aix.in | 2 +-
 configure            | 4 ++--
 configure.in         | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 63ee79b32e5..b2130bc26ec 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1256,7 +1256,7 @@ distclean: clobber
 	done
 	-rm -f core Makefile Makefile.pre config.status \
 		Modules/Setup Modules/Setup.local Modules/Setup.config \
-		Modules/ld_so_aix Misc/python.pc
+		Modules/ld_so_aix Modules/python.exp Misc/python.pc
 	-rm -f python*-gdb.py
 	-rm -f pybuilddir.txt
 	find $(srcdir) '(' -name '*.fdc' -o -name '*~' \
diff --git a/Misc/NEWS b/Misc/NEWS
index f5aec4506f6..6b339ef0e57 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,11 @@ Core and Builtins
 Library
 -------
 
+Build
+-----
+
+- Issue #941346: Fix broken shared library build on AIX.
+
 
 What's New in Python 3.2 Release Candidate 3?
 =============================================
diff --git a/Modules/ld_so_aix.in b/Modules/ld_so_aix.in
index 0fd245b0622..86a9f7e15e6 100644
--- a/Modules/ld_so_aix.in
+++ b/Modules/ld_so_aix.in
@@ -131,7 +131,7 @@ do
   shift
 done
 
-if test "$objfile" = "libpython@VERSION@.so"; then
+if test "$objfile" = "libpython@VERSION@@ABIFLAGS@.so"; then
   ldsocoremode="true" 
 fi
 
diff --git a/configure b/configure
index 2129cdc7b5b..dbca957e864 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 87698 .
+# From configure.in Revision: 88350 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for python 3.2.
 #
@@ -7426,7 +7426,7 @@ if test -z "$LDSHARED"
 then
 	case $ac_sys_system/$ac_sys_release in
 	AIX*)
-		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp -L\$(srcdir)"
+		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp"
 		LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
 		;;
 	IRIX/5*) LDSHARED="ld -shared";;
diff --git a/configure.in b/configure.in
index 419a93c8d98..d4d33b5d265 100644
--- a/configure.in
+++ b/configure.in
@@ -1642,7 +1642,7 @@ if test -z "$LDSHARED"
 then
 	case $ac_sys_system/$ac_sys_release in
 	AIX*)
-		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp -L\$(srcdir)"
+		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp"
 		LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
 		;;
 	IRIX/5*) LDSHARED="ld -shared";;