[Python-checkins] r84683 - in python/branches/release27-maint: Lib/distutils/command/build_ext.py Makefile.pre.in Misc/NEWS Modules/ld_so_aix Modules/ld_so_aix.in configure configure.in

Fri Sep 10 22:03:17 CEST 2010

Author: antoine.pitrou
Date: Fri Sep 10 22:03:17 2010
New Revision: 84683
Log:
Merged revisions 84680 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r84680 | antoine.pitrou | 2010年09月10日 21:44:44 +0200 (ven., 10 sept. 2010) | 4 lines
 
 Issue #941346: Improve the build process under AIX and allow Python to
 be built as a shared library. Patch by Sébastien Sablé.
........
Added:
 python/branches/release27-maint/Modules/ld_so_aix.in
 - copied unchanged from r84680, /python/branches/py3k/Modules/ld_so_aix.in
Removed:
 python/branches/release27-maint/Modules/ld_so_aix
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/Lib/distutils/command/build_ext.py
 python/branches/release27-maint/Makefile.pre.in
 python/branches/release27-maint/Misc/NEWS
 python/branches/release27-maint/configure
 python/branches/release27-maint/configure.in
Modified: python/branches/release27-maint/Lib/distutils/command/build_ext.py
==============================================================================

--- python/branches/release27-maint/Lib/distutils/command/build_ext.py	(original)
+++ python/branches/release27-maint/Lib/distutils/command/build_ext.py	Fri Sep 10 22:03:17 2010
@@ -753,7 +753,9 @@
 elif sys.platform == 'darwin':
 # Don't use the default code below
 return ext.libraries
-
+ elif sys.platform[:3] == 'aix':
+ # Don't use the default code below
+ return ext.libraries
 else:
 from distutils import sysconfig
 if sysconfig.get_config_var('Py_ENABLE_SHARED'):
Modified: python/branches/release27-maint/Makefile.pre.in
==============================================================================
--- python/branches/release27-maint/Makefile.pre.in	(original)
+++ python/branches/release27-maint/Makefile.pre.in	Fri Sep 10 22:03:17 2010
@@ -422,10 +422,10 @@
 
 libpython$(VERSION).so: $(LIBRARY_OBJS)
 	if test $(INSTSONAME) != $(LDLIBRARY); then \
-		$(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+		$(BLDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
 		$(LN) -f $(INSTSONAME) $@; \
 	else \
-		$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+		$(BLDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
 	fi
 
 libpython$(VERSION).dylib: $(LIBRARY_OBJS)
@@ -1197,7 +1197,7 @@
 	done
 	-rm -f core Makefile Makefile.pre config.status \
 		Modules/Setup Modules/Setup.local Modules/Setup.config \
-		Misc/python.pc
+		Modules/ld_so_aix Misc/python.pc
 	-rm -f python*-gdb.py
 	find $(srcdir) '(' -name '*.fdc' -o -name '*~' \
 			 -o -name '[@,#]*' -o -name '*.old' \
Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Fri Sep 10 22:03:17 2010
@@ -302,6 +302,9 @@
 Build
 -----
 
+- Issue #941346: Improve the build process under AIX and allow Python to
+ be built as a shared library. Patch by Sébastien Sablé.
+
 - Issue #4026: Make the fcntl extension build under AIX. Patch by Sébastien
 Sablé.
 
Deleted: python/branches/release27-maint/Modules/ld_so_aix
==============================================================================
--- python/branches/release27-maint/Modules/ld_so_aix	Fri Sep 10 22:03:17 2010
+++ (empty file)
@@ -1,190 +0,0 @@
-#!/bin/sh
-#
-# ========================================================================
-# FILE: ld_so_aix
-# TYPE: executable, uses makexp_aix
-# SYSTEM: AIX
-#
-# DESCRIPTION: Creates a shareable .o from a set of pre-compiled 
-# (unshared) .o files
-#
-# USAGE: ld_so_aix [CC] [arguments]
-#
-# ARGUMENTS: Same as for "ld". The following arguments are processed
-# or supplied by this script (those marked with an asterisk
-# can be overriden from command line):
-#
-# Argument Default value
-# (*) -o [OutputFileName] -o shr.o
-# (*) -e [EntryPointLabel] -e init[OutputBaseName]
-# (*) -bE:[ExportFile] -bE:[OutputBaseName].exp
-# (*) -bI:[ImportFile] -bI:./python.exp
-# -bM:[ModuleType] -bM:SRE
-# -bhalt:[Number] -bhalt:4
-# -T[Number] -T512
-# -H[Number] -H512
-# -lm
-#
-# The compiler specific ("-lc" or "-lc_r", "-lpthreads",...)
-# arguments will be automatically passed to "ld" according
-# to the CC command provided as a first argument to this
-# script. Usually, the same CC command was used to produce
-# the pre-compiled .o file(s).
-#
-# NOTES: 1. Since "ld_so_aix" was originally written for building
-# shared modules for the Python interpreter, the -e and
-# -bI default values match Python's conventions. In
-# Python, the entry point for a shared module is based
-# on the module's name (e.g., the "mathmodule" will
-# expect an entry point of "initmath").
-# 2. The script accepts multiple .o or .a input files and
-# creates a single (shared) output file. The export list
-# that is created is based on the output file's basename
-# with the suffix ".exp".
-# 3. The resulting shared object file is left in the
-# current directory.
-# 4. Uncommenting the "echo" lines gives detailed output
-# about the commands executed in the script.
-#
-# 
-# HISTORY: Oct-1996 -- Support added for multiple .o files --
-# -- and optional arguments processing. --
-# Chris Myers (myers at tc.cornell.edu), Keith Kwok
-# (kkwok at tc.cornell.edu) and Vladimir Marangozov
-#
-# Aug-6-1996 -- Take care of the compiler specific --
-# -- args by leaving CC to invoke "ld". --
-# Vladimir Marangozov
-#
-# Jul-1-1996 -- Make sure to use /usr/ccs/bin/ld --
-# -- Use makexp_aix for the export list. --
-# Vladimir Marangozov (Vladimir.Marangozov at imag.fr)
-#
-# Manus Hand (mhand at csn.net) -- Initial code -- 6/24/96
-# ========================================================================
-#
-
-usage="Usage: ld_so_aix [CC command] [ld arguments]"
-if test ! -n "$*"; then
- echo $usage; exit 2
-fi
-
-makexp=`dirname 0ドル`/makexp_aix
-
-# Check for existence of compiler.
-CC=1ドル; shift
-whichcc=`which $CC`
-
-if test ! -x "$whichcc"; then
- echo "ld_so_aix: Compiler '$CC' not found; exiting."
- exit 2
-fi
-
-if test ! -n "$*"; then
- echo $usage; exit 2
-fi
-
-# Default import file for Python
-# Can be overriden by providing a -bI: argument.
-impfile="./python.exp"
-
-# Parse arguments
-while test -n "1ドル"
-do
- case "1ドル" in
- -e | -Wl,-e)
- if test -z "2ドル"; then
-	 echo "ld_so_aix: The -e flag needs a parameter; exiting."; exit 2
-	else
-	 shift; entry=1ドル
-	fi
-	;;
- -e* | -Wl,-e*)
-	entry=`echo 1ドル | sed -e "s/-Wl,//" -e "s/-e//"`
-	;;
- -o)
-	if test -z "2ドル"; then
-	 echo "ld_so_aix: The -o flag needs a parameter; exiting."; exit 2
-	else
-	 shift; objfile=1ドル
-	fi
-	;;
- -o*)
-	objfile=`echo 1ドル | sed "s/-o//"`
-	;;
- -bI:* | -Wl,-bI:*)
-	impfile=`echo 1ドル | sed -e "s/-Wl,//" -e "s/-bI://"`
-	;;
- -bE:* | -Wl,-bE:*)
-	expfile=`echo 1ドル | sed -e "s/-Wl,//" -e "s/-bE://"`
-	;;
- *.o | *.a)
-	objs="$objs 1ドル"
-	args="$args 1ドル"
-	;;
- -bM:* | -Wl,-bM:* | -H* | -Wl,-H* | -T* | -Wl,-T* | -lm)
-	;;
- *)
- args="$args 1ドル"
-	;;
- esac
- shift
-done
-
-
-if test -z "$objs"; then
- echo "ld_so_aix: No input files; exiting."
- exit 2
-elif test ! -r "$impfile"; then
- echo "ld_so_aix: Import file '$impfile' not found or not readable; exiting."
- exit 2
-fi
-
-# If -o wasn't specified, assume "-o shr.o"
-if test -z "$objfile"; then
- objfile=shr.o
-fi
-
-filename=`basename $objfile | sed "s/\.[^.]*$//"`
-
-# If -bE: wasn't specified, assume "-bE:$filename.exp"
-if test -z "$expfile"; then
- expfile="$filename.exp"
-fi
-
-# Default entry symbol for Python modules = init[modulename]
-# Can be overriden by providing a -e argument.
-if test -z "$entry"; then
- entry=init`echo $filename | sed "s/module.*//"`
-fi
-
-#echo "ld_so_aix: Debug info section"
-#echo " -> output file : $objfile"
-#echo " -> import file : $impfile"
-#echo " -> export file : $expfile"
-#echo " -> entry point : $entry"
-#echo " -> object files: $objs"
-#echo " -> CC arguments: $args"
-
-CCOPT="-Wl,-e$entry -Wl,-bE:$expfile -Wl,-bI:$impfile -Wl,-bhalt:4"
-CCOPT="$CCOPT -Wl,-bM:SRE -Wl,-T512 -Wl,-H512 -lm -o $objfile"
-# Note: to use dynamic libraries like libtcl8.4.so and libtk8.4.so 
-# you may need to replace the second CCOPT line above with the following:
-# CCOPT="$CCOPT -Wl,-bM:SRE -Wl,-T512 -Wl,-H512 -brtl -bnortllib -lm -o $objfile"
-
-CCARGS="$args"
-
-# Export list generation.
-#echo $makexp $expfile "$objfile" $objs
-$makexp $expfile "$objfile" $objs
-
-# Perform the link.
-#echo $CC $CCOPT $CCARGS
-$CC $CCOPT $CCARGS
-retval=$?
-
-# Delete the module's export list file.
-# Comment this line if you need it.
-rm -f $expfile
-
-exit $retval
Modified: python/branches/release27-maint/configure
==============================================================================
--- python/branches/release27-maint/configure	(original)
+++ python/branches/release27-maint/configure	Fri Sep 10 22:03:17 2010
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 84585 .
+# From configure.in Revision: 84676 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 2.7.
 #
@@ -4950,6 +4950,10 @@
 	BLDLIBRARY='-L. -lpython$(VERSION)'
 	RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
 	;;
+ AIX*)
+	LDLIBRARY='libpython$(VERSION).so'
+	RUNSHARED=LIBPATH=`pwd`:${LIBPATH}
+	;;
 
 esac
 else # shared is disabled
@@ -7531,7 +7535,7 @@
 then
 	case $ac_sys_system/$ac_sys_release in
 	AIX*)
-		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp"
+		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp -L\$(srcdir)"
 		LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
 		;;
 	BeOS*)
@@ -13753,6 +13757,8 @@
 # generate output files
 ac_config_files="$ac_config_files Makefile.pre Modules/Setup.config Misc/python.pc"
 
+ac_config_files="$ac_config_files Modules/ld_so_aix"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -14446,6 +14452,7 @@
 "Makefile.pre") CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
 "Modules/Setup.config") CONFIG_FILES="$CONFIG_FILES Modules/Setup.config" ;;
 "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
+ "Modules/ld_so_aix") CONFIG_FILES="$CONFIG_FILES Modules/ld_so_aix" ;;
 
 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
 esac
@@ -14985,6 +14992,11 @@
 
 esac
 
+
+ case $ac_file$ac_mode in
+ "Modules/ld_so_aix":F) chmod +x Modules/ld_so_aix ;;
+
+ esac
 done # for ac_tag
 
 
Modified: python/branches/release27-maint/configure.in
==============================================================================
--- python/branches/release27-maint/configure.in	(original)
+++ python/branches/release27-maint/configure.in	Fri Sep 10 22:03:17 2010
@@ -823,6 +823,10 @@
 	BLDLIBRARY='-L. -lpython$(VERSION)'
 	RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
 	;;
+ AIX*)
+	LDLIBRARY='libpython$(VERSION).so'
+	RUNSHARED=LIBPATH=`pwd`:${LIBPATH}
+	;;
 
 esac
 else # shared is disabled
@@ -1757,7 +1761,7 @@
 then
 	case $ac_sys_system/$ac_sys_release in
 	AIX*)
-		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp"
+		BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp -L\$(srcdir)"
 		LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp"
 		;;
 	BeOS*)
@@ -4273,6 +4277,7 @@
 
 # generate output files
 AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
+AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
 AC_OUTPUT
 
 echo "creating Modules/Setup"
