Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at Fri May 27 09:57:27 CEST 2011.
-------- --- python/python-base.changes 2011-05-02 18:07:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python-base.changes 2011-05-24 17:30:27.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 24 14:27:05 UTC 2011 - [email protected] + +- update to 2.7.1 + * bugfix-only release, see NEWS for details +- refreshed patches, dropped the upstreamed ones +- dropped acrequire patch, replacing it with build-time sed +- improved fix to bnc#673071 by defining the constants + only for files that require it (as is done in python3) + +------------------------------------------------------------------- --- python/python-doc.changes 2010-08-26 13:45:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python-doc.changes 2011-05-24 17:30:28.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 24 14:30:36 UTC 2011 - [email protected] + +- updated to build against 2.7.1 + +------------------------------------------------------------------- --- python/python.changes 2011-05-04 16:18:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python.changes 2011-05-24 17:30:28.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 24 14:30:10 UTC 2011 - [email protected] + +- updated to 2.7.1 + * bugfix-only release + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Python-2.7.tar.bz2 Python-2.7rc2-multilib.patch python-2.6.5-distutils_test_path.patch python-2.7-acrequire.patch python-fix_date_time_compiler.patch smtpd-dos.patch urllib2-AbstractBasicAuthHandler_reset_attr.diff New: ---- Python-2.7.1.tar.bz2 python-2.7.1-distutils_test_path.patch python-2.7.1-fix_date_time_compiler.patch python-2.7.1-multilib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.SEa00V/_old 2011-05-27 09:44:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SEa00V/_new 2011-05-27 09:44:55.000000000 +0200 @@ -29,8 +29,8 @@ %endif # Summary: Python Interpreter base package -Version: 2.7 -Release: 8 +Version: 2.7.1 +Release: 1 %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -42,17 +42,14 @@ Patch1: python-2.7-dirs.patch Patch2: python-distutils-rpm-8.patch -Patch3: Python-2.7rc2-multilib.patch +Patch3: python-2.7.1-multilib.patch Patch4: python-2.7rc2-canonicalize2.patch Patch5: python-2.7rc2-configure.patch Patch6: python-2.6-gettext-plurals.patch -Patch7: python-2.6.5-distutils_test_path.patch +Patch7: python-2.7.1-distutils_test_path.patch Patch8: sparc_longdouble.patch -Patch9: python-2.7-acrequire.patch -Patch10: urllib2-AbstractBasicAuthHandler_reset_attr.diff -Patch11: smtpd-dos.patch Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch -Patch13: python-fix_date_time_compiler.patch +Patch13: python-2.7.1-fix_date_time_compiler.patch Patch14: python-2.7-CVE-2011-1521-fileurl.patch Patch15: python-2.7-fix-parallel-make.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -144,42 +141,26 @@ %patch6 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -%patch10 -%patch11 %patch12 -%patch13 +%patch13 -p1 %patch14 -p1 %patch15 -p1 -# some cleanup -find . -name .cvsignore -type f -print0 | xargs -0 rm -f -find . -name CVS -type d -print0 | xargs -0 rm -rf +# drop Autoconf version requirement +sed -i 's/^version_required/dnl version_required/' configure.in %build -######################################## -# disable as-needed to fix build -######################################## -export SUSE_ASNEEDED=0 -######################################## -# use rpm_opt_flags -######################################## export OPT="$RPM_OPT_FLAGS" -######################################## -# regenerate -######################################## + autoreconf -f -i . # Modules/_ctypes/libffi + +# provide a stable timestamp +touch -r %{S:0} Makefile.pre.in + # prevent make from trying to rebuild asdl stuff, which requires existing # python installation touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h -# use just gcc instead of [GCC 4.5.0 20100604 [gcc-4_5-branch revision 160292].. -echo '#define PYTHON_COMPILER "[GCC]"' >> pyconfig.h.in -# use a compilation date equivalent to the source tarball. -printf '#define PY_BUILD_DATE "%s %s %s"\n' $(date -u -r %{SOURCE0} +"%b %d %Y") >> pyconfig.h.in -printf '#define PY_BUILD_TIME "%s"\n' $(date -u -r %{SOURCE0} +"%T") >> pyconfig.h.in -######################################## -# configure -######################################## + ./configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -189,9 +170,7 @@ --enable-ipv6 \ --enable-shared \ --enable-unicode=ucs4 -######################################## -# compile -######################################## + LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \ make %{?_smp_mflags} \ DESTDIR=$RPM_BUILD_ROOT \ @@ -207,6 +186,8 @@ EXCLUDE="-x test_urllib2 -x test_file -x test_file2k" # test_nis and test_threading are AWFULLY slow. EXCLUDE="$EXCLUDE -x test_nis -x test_threading" +# test_gdb fails if gdb with (different) python support is part of the buildsystem +EXCLUDE="$EXCLUDE -x test_gdb" %ifarch ia64 # test_smtplib's testSend is known to be broken and on ia64 it actually fails most of the time, preventing the build. EXCLUDE="$EXCLUDE -x test_smtplib" @@ -374,7 +355,6 @@ %{_libdir}/python%{python_version}/lib-dynload/_socket.so %{_libdir}/python%{python_version}/lib-dynload/_struct.so %{_libdir}/python%{python_version}/lib-dynload/_testcapi.so -%{_libdir}/python%{python_version}/lib-dynload/_weakref.so %{_libdir}/python%{python_version}/lib-dynload/array.so %{_libdir}/python%{python_version}/lib-dynload/binascii.so #arm doesn't build this module ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.SEa00V/_old 2011-05-27 09:44:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SEa00V/_new 2011-05-27 09:44:55.000000000 +0200 @@ -24,8 +24,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.7 -Release: 8 -%define pyver 2.7 +Release: 9 +%define pyver 2.7.1 BuildArch: noarch %define tarname Python-%{pyver} %define pyname python ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.SEa00V/_old 2011-05-27 09:44:55.000000000 +0200 +++ /var/tmp/diff_new_pack.SEa00V/_new 2011-05-27 09:44:55.000000000 +0200 @@ -31,8 +31,8 @@ # Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter -Version: 2.7 -Release: 15 +Version: 2.7.1 +Release: 1 Requires: python-base = %{version} %define tarversion %{version} %define tarname Python-%{tarversion} @@ -44,14 +44,13 @@ #Source11: testfiles.tar.bz2 # issues with copyrighted Unicode testing files Patch1: python-2.7-dirs.patch -Patch2: Python-2.7rc2-multilib.patch +Patch2: python-2.7.1-multilib.patch Patch3: python-2.7rc2-canonicalize2.patch Patch4: python-2.5.1-sqlite.patch Patch5: python-2.7rc2-configure.patch Patch6: python-2.6b3-curses-panel.patch Patch7: sparc_longdouble.patch -Patch8: python-2.7-acrequire.patch -Patch9: python-fix_date_time_compiler.patch +Patch9: python-2.7.1-fix_date_time_compiler.patch Patch10: python-2.7-fix-parallel-make.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -173,7 +172,6 @@ Guido van Rossum <[email protected]> %prep -#%%setup -q -n %{tarname} -a11 %setup -q -n %{tarname} # patching %patch1 -p1 @@ -183,37 +181,23 @@ %patch5 %patch6 %patch7 -p1 -%patch8 -p1 -%patch9 +%patch9 -p1 %patch10 -p1 -# some cleanup -find . -name .cvsignore -type f -print0 | xargs -0 rm -f -find . -name CVS -type d -print0 | xargs -0 rm -rf + +# drop Autoconf version requirement +sed -i 's/^version_required/dnl version_required/' configure.in %build -######################################## -# disable as-needed to fix build -######################################## +# necessary for correct linking with GDBM: export SUSE_ASNEEDED=0 -######################################## -# use rpm_opt_flags -######################################## + export OPT="$RPM_OPT_FLAGS" -######################################## -# regenerate -######################################## + autoreconf -f -i . # Modules/_ctypes/libffi # prevent make from trying to rebuild asdl stuff, which requires existing # python installation touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h -# use just gcc instead of [GCC 4.5.0 20100604 [gcc-4_5-branch revision 160292].. -echo '#define PYTHON_COMPILER "[GCC]"' >> pyconfig.h.in -# use a compilation date equivalent to the source tarball. -printf '#define PY_BUILD_DATE "%s %s %s"\n' $(date -u -r %{SOURCE0} +"%b %d %Y") >> pyconfig.h.in -printf '#define PY_BUILD_TIME "%s"\n' $(date -u -r %{SOURCE0} +"%T") >> pyconfig.h.in -######################################## -# configure -######################################## + ./configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -223,9 +207,7 @@ --with-fpectl \ --enable-shared \ --enable-unicode=ucs4 -######################################## -# compile -######################################## + make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT %check @@ -314,7 +296,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_socket.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_struct.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_testcapi.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_weakref.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/array.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/binascii.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/bz2.so ++++++ Python-2.7.tar.bz2 -> Python-2.7.1.tar.bz2 ++++++ python/Python-2.7.tar.bz2 /mounts/work_src_done/STABLE/python/Python-2.7.1.tar.bz2 differ: char 11, line 1 ++++++ python-2.6.5-distutils_test_path.patch -> python-2.7.1-distutils_test_path.patch ++++++ --- python/python-2.6.5-distutils_test_path.patch 2010-08-26 15:45:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python-2.7.1-distutils_test_path.patch 2011-05-24 17:30:27.000000000 +0200 @@ -18,12 +18,12 @@ + cmd.inplace = 1 + cmd.run() + so_file = cmd.get_outputs()[0] - self.assert_(os.path.exists(so_file)) - self.assertEquals(os.path.splitext(so_file)[-1], - sysconfig.get_config_var('SO')) + self.assertTrue(os.path.exists(so_file)) + self.assertEqual(os.path.splitext(so_file)[-1], + sysconfig.get_config_var('SO')) so_dir = os.path.dirname(so_file) -- self.assertEquals(so_dir, other_tmp_dir) -+ self.assertEquals(so_dir, os.getcwd()) +- self.assertEqual(so_dir, other_tmp_dir) ++ self.assertEqual(so_dir, os.getcwd()) cmd.compiler = None cmd.inplace = 0 cmd.run() ++++++ python-2.7.1-fix_date_time_compiler.patch ++++++ Index: Python-3.2/Makefile.pre.in =================================================================== --- Python-3.2.orig/Makefile.pre.in +++ Python-3.2/Makefile.pre.in @@ -554,7 +554,15 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \ $(SIGNAL_OBJS) \ $(MODOBJS) \ $(srcdir)/Modules/getbuildinfo.c - $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c + $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" \ + -DDATE="\"`LC_ALL=C date -u -r Makefile.pre.in +"%b %d %Y"`\"" \ + -DTIME="\"`LC_ALL=C date -u -r Makefile.pre.in +"%T"`\"" \ + -o $@ $(srcdir)/Modules/getbuildinfo.c + +Python/getcompiler.o: $(srcdir)/Python/getcompiler.c Makefile + $(CC) -c $(PY_CFLAGS) \ + -DCOMPILER='"[GCC]"' \ + -o $@ $(srcdir)/Python/getcompiler.c Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ ++++++ python-2.7.1-multilib.patch ++++++ Index: Python-2.7.1/Include/pythonrun.h =================================================================== --- Python-2.7.1.orig/Include/pythonrun.h +++ Python-2.7.1/Include/pythonrun.h @@ -108,6 +108,8 @@ PyAPI_FUNC(char *) Py_GetPath(void); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); PyAPI_FUNC(const char *) Py_GetPlatform(void); +PyAPI_FUNC(const char *) Py_GetArch(void); +PyAPI_FUNC(const char *) Py_GetLib(void); PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); Index: Python-2.7.1/Lib/distutils/command/install.py =================================================================== --- Python-2.7.1.orig/Lib/distutils/command/install.py +++ Python-2.7.1/Lib/distutils/command/install.py @@ -22,6 +22,8 @@ from site import USER_BASE from site import USER_SITE +libname = sys.lib + if sys.version < "2.2": WINDOWS_SCHEME = { 'purelib': '$base', @@ -42,7 +44,7 @@ else: INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', - 'platlib': '$platbase/lib/python$py_version_short/site-packages', + 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages', 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', Index: Python-2.7.1/Lib/distutils/sysconfig.py =================================================================== --- Python-2.7.1.orig/Lib/distutils/sysconfig.py +++ Python-2.7.1/Lib/distutils/sysconfig.py @@ -114,8 +114,11 @@ def get_python_lib(plat_specific=0, stan prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": - libpython = os.path.join(prefix, - "lib", "python" + get_python_version()) + if plat_specific or standard_lib: + lib = sys.lib + else: + lib = "lib" + libpython = os.path.join(prefix, lib, "python" + get_python_version()) if standard_lib: return libpython else: Index: Python-2.7.1/Lib/pydoc.py =================================================================== --- Python-2.7.1.orig/Lib/pydoc.py +++ Python-2.7.1/Lib/pydoc.py @@ -349,7 +349,7 @@ class Doc: docloc = os.environ.get("PYTHONDOCS", "http://docs.python.org/library";) - basedir = os.path.join(sys.exec_prefix, "lib", + basedir = os.path.join(sys.exec_prefix, sys.lib, "python"+sys.version[0:3]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', Index: Python-2.7.1/Lib/site.py =================================================================== --- Python-2.7.1.orig/Lib/site.py +++ Python-2.7.1/Lib/site.py @@ -290,13 +290,18 @@ def getsitepackages(): if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': - sitepackages.append(os.path.join(prefix, "lib", + sitepackages.append(os.path.join(prefix, sys.lib, "python" + sys.version[:3], "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-python")) + sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) + if sys.lib != "lib": + sitepackages.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], + "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-python")) else: sitepackages.append(prefix) - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) + sitepackages.append(os.path.join(prefix, sys.lib, "site-packages")) if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. Index: Python-2.7.1/Lib/test/test_dl.py =================================================================== --- Python-2.7.1.orig/Lib/test/test_dl.py +++ Python-2.7.1/Lib/test/test_dl.py @@ -5,10 +5,11 @@ import unittest from test.test_support import verbose, import_module dl = import_module('dl', deprecated=True) +import sys sharedlibs = [ - ('/usr/lib/libc.so', 'getpid'), - ('/lib/libc.so.6', 'getpid'), + ('/usr/'+sys.lib+'/libc.so', 'getpid'), + ('/'+sys.lib+'/libc.so.6', 'getpid'), ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] Index: Python-2.7.1/Lib/trace.py =================================================================== --- Python-2.7.1.orig/Lib/trace.py +++ Python-2.7.1/Lib/trace.py @@ -762,10 +762,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) s = s.replace("$prefix", - os.path.join(sys.prefix, "lib", + os.path.join(sys.prefix, sys.lib, "python" + sys.version[:3])) s = s.replace("$exec_prefix", - os.path.join(sys.exec_prefix, "lib", + os.path.join(sys.exec_prefix, sys.lib, "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) Index: Python-2.7.1/Makefile.pre.in =================================================================== --- Python-2.7.1.orig/Makefile.pre.in +++ Python-2.7.1/Makefile.pre.in @@ -78,6 +78,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG # Machine-dependent subdirectories MACHDEP= @MACHDEP@ +LIB= @LIB@ +ARCH= @ARCH@ # Install prefix for architecture-independent files prefix= @prefix@ @@ -530,6 +532,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ + -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' \ -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c @@ -561,7 +564,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c - $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c + $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c Index: Python-2.7.1/Modules/getpath.c =================================================================== --- Python-2.7.1.orig/Modules/getpath.c +++ Python-2.7.1/Modules/getpath.c @@ -116,9 +116,11 @@ #define EXEC_PREFIX PREFIX #endif +#define LIB_PYTHON LIB "/python" VERSION + #ifndef PYTHONPATH -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" +#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ + EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" #endif #ifndef LANDMARK @@ -129,7 +131,7 @@ static char prefix[MAXPATHLEN+1]; static char exec_prefix[MAXPATHLEN+1]; static char progpath[MAXPATHLEN+1]; static char *module_search_path = NULL; -static char lib_python[] = "lib/python" VERSION; +static char lib_python[] = LIB_PYTHON; static void reduce(char *dir) Index: Python-2.7.1/Python/getplatform.c =================================================================== --- Python-2.7.1.orig/Python/getplatform.c +++ Python-2.7.1/Python/getplatform.c @@ -10,3 +10,23 @@ Py_GetPlatform(void) { return PLATFORM; } + +#ifndef ARCH +#define ARCH "unknown" +#endif + +const char * +Py_GetArch(void) +{ + return ARCH; +} + +#ifndef LIB +#define LIB "lib" +#endif + +const char * +Py_GetLib(void) +{ + return LIB; +} Index: Python-2.7.1/Python/sysmodule.c =================================================================== --- Python-2.7.1.orig/Python/sysmodule.c +++ Python-2.7.1/Python/sysmodule.c @@ -1470,6 +1470,10 @@ _PySys_Init(void) PyString_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyString_FromString(Py_GetPlatform())); + SET_SYS_FROM_STRING("arch", + PyString_FromString(Py_GetArch())); + SET_SYS_FROM_STRING("lib", + PyString_FromString(Py_GetLib())); SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); SET_SYS_FROM_STRING("prefix", Index: Python-2.7.1/configure.in =================================================================== --- Python-2.7.1.orig/configure.in +++ Python-2.7.1/configure.in @@ -636,6 +636,41 @@ SunOS*) ;; esac +AC_SUBST(ARCH) +AC_MSG_CHECKING(ARCH) +ARCH=`uname -m` +case $ARCH in +i?86) ARCH=i386;; +esac +AC_MSG_RESULT($ARCH) + +AC_SUBST(LIB) +AC_MSG_CHECKING(LIB) +case $ac_sys_system in +Linux*) + # Test if the compiler is 64bit + echo 'int i;' > conftest.$ac_ext + python_cv_cc_64bit_output=no + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *"ELF 64"*) + python_cv_cc_64bit_output=yes + ;; + esac + fi + rm -rf conftest* + ;; +esac + +case $ARCH:$python_cv_cc_64bit_output in +ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) + LIB="lib64" + ;; +*:*) + LIB="lib" + ;; +esac +AC_MSG_RESULT($LIB) AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) Index: Python-2.7.1/setup.py =================================================================== --- Python-2.7.1.orig/setup.py +++ Python-2.7.1/setup.py @@ -347,7 +347,7 @@ class PyBuildExt(build_ext): def detect_modules(self): # Ensure that /usr/local is always used - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.library_dirs, '/usr/local/' + sys.lib) add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # Add paths specified in the environment variables LDFLAGS and @@ -404,8 +404,7 @@ class PyBuildExt(build_ext): # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. lib_dirs = self.compiler.library_dirs + [ - '/lib64', '/usr/lib64', - '/lib', '/usr/lib', + '/' + sys.lib, '/usr/' + sys.lib, ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] exts = [] @@ -654,11 +653,11 @@ class PyBuildExt(build_ext): elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + - ['/usr/lib/termcap'], + ['/usr/'+sys.lib+'/termcap'], 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], + library_dirs=['/usr/'+sys.lib+'/termcap'], extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: @@ -1730,18 +1729,17 @@ class PyBuildExt(build_ext): # Check for various platform-specific directories if platform == 'sunos5': include_dirs.append('/usr/openwin/include') - added_lib_dirs.append('/usr/openwin/lib') + added_lib_dirs.append('/usr/openwin/' + sys.lib) elif os.path.exists('/usr/X11R6/include'): include_dirs.append('/usr/X11R6/include') - added_lib_dirs.append('/usr/X11R6/lib64') - added_lib_dirs.append('/usr/X11R6/lib') + added_lib_dirs.append('/usr/X11R6/' + sys.lib) elif os.path.exists('/usr/X11R5/include'): include_dirs.append('/usr/X11R5/include') - added_lib_dirs.append('/usr/X11R5/lib') + added_lib_dirs.append('/usr/X11R5/' + sys.lib) else: # Assume default location for X11 include_dirs.append('/usr/X11/include') - added_lib_dirs.append('/usr/X11/lib') + added_lib_dirs.append('/usr/X11/' + sys.lib) # If Cygwin, then verify that X is installed before proceeding if platform == 'cygwin': Index: Python-2.7.1/Lib/test/test_site.py =================================================================== --- Python-2.7.1.orig/Lib/test/test_site.py +++ Python-2.7.1/Lib/test/test_site.py @@ -169,12 +169,16 @@ class HelperFunctionsTests(unittest.Test wanted = os.path.join('xoxo', 'Lib', 'site-packages') self.assertEqual(dirs[0], wanted) elif os.sep == '/': - self.assertEqual(len(dirs), 2) wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], 'site-packages') - self.assertEqual(dirs[0], wanted) + self.assertTrue(wanted in dirs) wanted = os.path.join('xoxo', 'lib', 'site-python') - self.assertEqual(dirs[1], wanted) + self.assertTrue(wanted in dirs) + wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3], + 'site-packages') + self.assertTrue(wanted in dirs) + wanted = os.path.join('xoxo', sys.lib, 'site-python') + self.assertTrue(wanted in dirs) else: self.assertEqual(len(dirs), 2) self.assertEqual(dirs[0], 'xoxo') Index: Python-2.7.1/Lib/sysconfig.py =================================================================== --- Python-2.7.1.orig/Lib/sysconfig.py +++ Python-2.7.1/Lib/sysconfig.py @@ -7,10 +7,10 @@ from os.path import pardir, realpath _INSTALL_SCHEMES = { 'posix_prefix': { - 'stdlib': '{base}/lib/python{py_version_short}', - 'platstdlib': '{platbase}/lib/python{py_version_short}', + 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', + 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', 'purelib': '{base}/lib/python{py_version_short}/site-packages', - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', + 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', 'include': '{base}/include/python{py_version_short}', 'platinclude': '{platbase}/include/python{py_version_short}', 'scripts': '{base}/bin', @@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { 'data' : '{userbase}', }, 'posix_user': { - 'stdlib': '{userbase}/lib/python{py_version_short}', - 'platstdlib': '{userbase}/lib/python{py_version_short}', + 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', + 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', + 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data' : '{userbase}', ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
