#941346: Fix broken shared library build on AIX. Patch by Sebastien Sable, review...

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 63ee79b32e5c10bdb186a2e1f5c5dfa5448b0fda..b2130bc26ec55ca961c6478a21fb19d6fa6db16e 100644 (file)
--- 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 f5aec4506f6a36e86293cb3c752eabf5a0dd6788..6b339ef0e5771f1530129682bea3de43b276bd53 100644 (file)
--- 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 0fd245b06229c5787df9b8669ed4e6aa6515cee0..86a9f7e15e642e7d31b3af053fc21b1d76eb9a9b 100644 (file)
--- 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 2129cdc7b5b95aca8898bd198d0baa17ce1479a6..dbca957e864e67f7ae1c9908eca604d15d5f3f9c 100755 (executable)
--- 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 419a93c8d98dd4bd49bcf994d1e9401b5d78e715..d4d33b5d265a7bb645bd3fb9d8de6c1318025d4c 100644 (file)
--- 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";;