diff options
| author | Georg Brandl <georg@python.org> | 2011-02-15 15:44:51 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-02-15 15:44:51 (GMT) |
| commit | 9a829bed975c30f4420f180baf935717c9416e28 (patch) | |
| tree | 9157544b52c715e5fbd37147110fe7f6036494bf | |
| parent | 08e278a562210c58ca7b4d6a4d19ff1ee22c5476 (diff) | |
| download | cpython-9a829bed975c30f4420f180baf935717c9416e28.zip cpython-9a829bed975c30f4420f180baf935717c9416e28.tar.gz cpython-9a829bed975c30f4420f180baf935717c9416e28.tar.bz2 | |
#941346: Fix broken shared library build on AIX. Patch by Sebastien Sable, review by Antoine Pitrou.
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Modules/ld_so_aix.in | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 63ee79b..b2130bc 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 '*~' \ @@ -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 0fd245b..86a9f7e 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 @@ -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 419a93c..d4d33b5 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";; |