Commit 6baf117d authored by Georg Brandl's avatar Georg Brandl

Merged revisions 88426 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

........
  r88426 | georg.brandl | 2011-02-15 16:44:51 +0100 (Di, 15 Feb 2011) | 1 line

  #941346: Fix broken shared library build on AIX. Patch by Sebastien Sable, review by Antoine Pitrou.
........
parent 2774310c
...@@ -1193,7 +1193,7 @@ clobber: clean profile-removal ...@@ -1193,7 +1193,7 @@ clobber: clean profile-removal
distclean: clobber distclean: clobber
-rm -f core Makefile Makefile.pre config.status \ -rm -f core Makefile Makefile.pre config.status \
Modules/Setup Modules/Setup.local Modules/Setup.config \ 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
find $(srcdir) '(' -name '*.fdc' -o -name '*~' \ find $(srcdir) '(' -name '*.fdc' -o -name '*~' \
-o -name '[@,#]*' -o -name '*.old' \ -o -name '[@,#]*' -o -name '*.old' \
-o -name '*.orig' -o -name '*.rej' \ -o -name '*.orig' -o -name '*.rej' \
......
...@@ -178,6 +178,8 @@ Extensions ...@@ -178,6 +178,8 @@ Extensions
Build Build
----- -----
- Issue #941346: Fix broken shared library build on AIX.
- Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in - Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in
the configure script but use $GREP instead. Patch by Fabian Groffen. the configure script but use $GREP instead. Patch by Fabian Groffen.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1730,7 +1730,7 @@ if test -z "$LDSHARED" ...@@ -1730,7 +1730,7 @@ if test -z "$LDSHARED"
then then
case $ac_sys_system/$ac_sys_release in case $ac_sys_system/$ac_sys_release in
AIX*) 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" LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
;; ;;
IRIX/5*) LDSHARED="ld -shared";; IRIX/5*) LDSHARED="ld -shared";;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment