From 9664bee729d487bcc0a0bc35859f8e13d5421c75 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 26 Sep 2012 01:10:42 +0000 Subject: Slackware 14.0 Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-) --- source/d/python/python.SlackBuild | 48 +++-- source/d/python/python.no-static-library.diff | 49 +++++ source/d/python/python.pure64.diff | 30 --- .../python/python.readline.set_pre_input_hook.diff | 4 +- source/d/python/python.x86_64.diff | 213 ++++++++++++--------- 5 files changed, 202 insertions(+), 142 deletions(-) create mode 100644 source/d/python/python.no-static-library.diff delete mode 100644 source/d/python/python.pure64.diff (limited to 'source/d/python') diff --git a/source/d/python/python.SlackBuild b/source/d/python/python.SlackBuild index debd7e95..220f3f02 100755 --- a/source/d/python/python.SlackBuild +++ b/source/d/python/python.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-2.6.6} -BUILD=${BUILD:-1} +PKGNAM=python +SRCNAM=Python +VERSION=$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . ) +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -38,7 +41,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-python +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG @@ -57,22 +60,23 @@ elif [ "$ARCH" = "armel" ]; then fi # Location for Python site-packages: -SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/python2.6/site-packages +SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/${PKGNAM}${BRANCH_VERSION}/site-packages # same as above without $PKG -TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/python2.6/site-packages +TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/${PKGNAM}${BRANCH_VERSION}/site-packages cd $TMP -rm -rf Python-$VERSION -tar xf $CWD/Python-$VERSION.tar.?z* || exit 1 -cd Python-$VERSION +rm -rf $SRCNAM-$VERSION +tar xf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$VERSION zcat $CWD/python.readline.set_pre_input_hook.diff.gz | patch -p1 --verbose || exit 1 +# We don't want a large libpython*.a: +zcat $CWD/python.no-static-library.diff.gz | patch -p1 --verbose || exit 1 if [ "$ARCH" = "x86_64" ]; then - # Install to lib64 instead of lib: - zcat $CWD/python.x86_64.diff.gz | patch -p1 --verbose || exit 1 - # Python must report /usr/lib64/python2.6/site-packages as python_lib_dir: - zcat $CWD/python.pure64.diff.gz | patch -p1 --verbose || exit 1 + # Install to lib64 instead of lib and + # Python must report /usr/lib64/python2.7/site-packages as python_lib_dir: + zcat $CWD/python.x86_64.diff.gz | patch -p1 --verbose || exit 1 fi chown -R root:root . @@ -87,7 +91,6 @@ find . \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --docdir=/usr/doc/python-$VERSION \ - --with-ncurses \ --with-threads \ --enable-ipv6 \ --enable-shared \ @@ -112,7 +115,6 @@ mv $SITEPK/README $PKG/usr/doc/python-$VERSION/README.python-tools # Make a few useful symlinks: mkdir -p $PKG/usr/bin ( cd $PKG/usr/bin - ln -sf $TOOLSDIR/modulator/modulator.py modulator ln -sf $TOOLSDIR/pynche/pynche pynche ln -sf $TOOLSDIR/i18n/msgfmt.py . ln -sf $TOOLSDIR/i18n/pygettext.py . @@ -126,9 +128,17 @@ tar xf $CWD/python-$VERSION-docs-text.tar.?z* mv python-${VERSION}-docs-text/* $PKG/usr/doc/python-$VERSION/Documentation chown -R root:root $PKG/usr/doc/python-$VERSION +# Fix possible incorrect permissions: +( cd $PKG + find . -type d -exec chmod 755 "{}" \; + find . -perm 640 -exec chmod 644 "{}" \; + find . -perm 750 -exec chmod 755 "{}" \; +) + + ( cd $PKG/usr/bin rm -f python - ln -sf python2.6 python + ln -sf python${BRANCH_VERSION} python ) ( cd $PKG @@ -143,6 +153,12 @@ chown -R root:root $PKG/usr/doc/python-$VERSION for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done ) +( cd $PKG/usr/man + if [ -r python${BRANCH_VERSION}.1.gz ] ; then + ln -sf python${BRANCH_VERSION}.1.gz python.1.gz + fi +) + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/d/python/python.no-static-library.diff b/source/d/python/python.no-static-library.diff new file mode 100644 index 00000000..96209897 --- /dev/null +++ b/source/d/python/python.no-static-library.diff @@ -0,0 +1,49 @@ +--- ./Makefile.pre.in.orig 2012-04-09 18:07:33.000000000 -0500 ++++ ./Makefile.pre.in 2012-05-09 13:38:24.913226185 -0500 +@@ -396,7 +396,7 @@ + + + # Build the interpreter +-$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) ++$(BUILDPYTHON): Modules/python.o $(LDLIBRARY) + $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ + Modules/python.o \ + $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) +@@ -412,18 +412,6 @@ + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ + esac + +-# Build static library +-# avoid long command lines, same as LIBRARY_OBJS +-$(LIBRARY): $(LIBRARY_OBJS) +- -rm -f $@ +- $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o +- $(AR) $(ARFLAGS) $@ $(PARSER_OBJS) +- $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS) +- $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) +- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS) +- $(AR) $(ARFLAGS) $@ $(MODOBJS) +- $(RANLIB) $@ +- + libpython$(VERSION).so: $(LIBRARY_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ + $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ +@@ -1008,18 +996,6 @@ + else true; \ + fi; \ + done +- @if test -d $(LIBRARY); then :; else \ +- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ +- if test "$(SO)" = .dll; then \ +- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ +- else \ +- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ +- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ +- fi; \ +- else \ +- echo Skip install of $(LIBRARY) - use make frameworkinstall; \ +- fi; \ +- fi + $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c + $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o + $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in diff --git a/source/d/python/python.pure64.diff b/source/d/python/python.pure64.diff deleted file mode 100644 index 7e4821af..00000000 --- a/source/d/python/python.pure64.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- ./Lib/distutils/command/install.py.orig 2010-11-27 17:21:23.000000000 -0600 -+++ ./Lib/distutils/command/install.py 2010-11-27 17:25:02.000000000 -0600 -@@ -41,14 +41,14 @@ - - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/lib64/python$py_version_short/site-packages', - 'platlib': '$platbase/lib64/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { -- 'purelib': '$base/lib/python', -+ 'purelib': '$base/lib64/python', - 'platlib': '$base/lib64/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', ---- ./Lib/distutils/sysconfig.py.orig 2010-11-27 17:21:23.000000000 -0600 -+++ ./Lib/distutils/sysconfig.py 2010-11-27 17:25:02.000000000 -0600 -@@ -122,7 +122,7 @@ - if plat_specific or standard_lib: - lib = "lib64" - else: -- lib = "lib" -+ lib = "lib64" - libpython = os.path.join(prefix, - lib, "python" + get_python_version()) - if standard_lib: diff --git a/source/d/python/python.readline.set_pre_input_hook.diff b/source/d/python/python.readline.set_pre_input_hook.diff index 8f5570c9..8af4b4be 100644 --- a/source/d/python/python.readline.set_pre_input_hook.diff +++ b/source/d/python/python.readline.set_pre_input_hook.diff @@ -1,5 +1,5 @@ ---- ./Modules/readline.c.orig 2010-05-09 10:15:40.000000000 -0500 -+++ ./Modules/readline.c 2010-11-27 17:08:38.000000000 -0600 +--- ./Modules/readline.c.orig 2008-11-04 14:43:31.000000000 -0600 ++++ ./Modules/readline.c 2009-06-09 14:23:16.000000000 -0500 @@ -11,6 +11,9 @@ #include #include diff --git a/source/d/python/python.x86_64.diff b/source/d/python/python.x86_64.diff index cb6bf258..0e7c6c45 100644 --- a/source/d/python/python.x86_64.diff +++ b/source/d/python/python.x86_64.diff @@ -1,11 +1,108 @@ ---- ./Makefile.pre.in.orig 2010-08-01 17:05:31.000000000 -0500 -+++ ./Makefile.pre.in 2010-11-27 17:22:05.000000000 -0600 -@@ -87,11 +87,11 @@ +diff -uar Python-2.7.2.orig/Lib/distutils/command/install.py Python-2.7.2/Lib/distutils/command/install.py +--- Python-2.7.2.orig/Lib/distutils/command/install.py 2011-06-11 18:46:24.000000000 +0300 ++++ Python-2.7.2/Lib/distutils/command/install.py 2011-06-13 12:29:32.239106481 +0300 +@@ -41,15 +41,15 @@ - # Expanded directories - BINDIR= @bindir@ --LIBDIR= @libdir@ -+LIBDIR= $(exec_prefix)/lib64 + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'purelib': '$base/lib64/python$py_version_short/site-packages', ++ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', + }, + 'unix_home': { +- 'purelib': '$base/lib/python', +- 'platlib': '$base/lib/python', ++ 'purelib': '$base/lib64/python', ++ 'platlib': '$base/lib64/python', + 'headers': '$base/include/python/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +diff -uar Python-2.7.2.orig/Lib/distutils/sysconfig.py Python-2.7.2/Lib/distutils/sysconfig.py +--- Python-2.7.2.orig/Lib/distutils/sysconfig.py 2011-06-11 18:46:24.000000000 +0300 ++++ Python-2.7.2/Lib/distutils/sysconfig.py 2011-06-13 12:29:32.239106481 +0300 +@@ -115,7 +115,7 @@ + + if os.name == "posix": + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ "lib64", "python" + get_python_version()) + if standard_lib: + return libpython + else: +diff -uar Python-2.7.2.orig/Lib/site.py Python-2.7.2/Lib/site.py +--- Python-2.7.2.orig/Lib/site.py 2011-06-11 18:46:25.000000000 +0300 ++++ Python-2.7.2/Lib/site.py 2011-06-13 12:29:32.239106481 +0300 +@@ -300,13 +300,13 @@ + 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, "lib64", + "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, "lib64", "site-packages")) + if sys.platform == "darwin": + # for framework builds *only* we add the standard Apple + # locations. +diff -uar Python-2.7.2.orig/Lib/sysconfig.py Python-2.7.2/Lib/sysconfig.py +--- Python-2.7.2.orig/Lib/sysconfig.py 2011-06-11 18:46:25.000000000 +0300 ++++ Python-2.7.2/Lib/sysconfig.py 2011-06-13 12:29:32.240106474 +0300 +@@ -7,20 +7,20 @@ + + _INSTALL_SCHEMES = { + 'posix_prefix': { +- 'stdlib': '{base}/lib/python{py_version_short}', +- 'platstdlib': '{platbase}/lib/python{py_version_short}', +- 'purelib': '{base}/lib/python{py_version_short}/site-packages', +- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', ++ 'stdlib': '{base}/lib64/python{py_version_short}', ++ 'platstdlib': '{platbase}/lib64/python{py_version_short}', ++ 'purelib': '{base}/lib64/python{py_version_short}/site-packages', ++ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', + 'include': '{base}/include/python{py_version_short}', + 'platinclude': '{platbase}/include/python{py_version_short}', + 'scripts': '{base}/bin', + 'data': '{base}', + }, + 'posix_home': { +- 'stdlib': '{base}/lib/python', +- 'platstdlib': '{base}/lib/python', +- 'purelib': '{base}/lib/python', +- 'platlib': '{base}/lib/python', ++ 'stdlib': '{base}/lib64/python', ++ 'platstdlib': '{base}/lib64/python', ++ 'purelib': '{base}/lib64/python', ++ 'platlib': '{base}/lib64/python', + 'include': '{base}/include/python', + 'platinclude': '{base}/include/python', + 'scripts': '{base}/bin', +@@ -65,10 +65,10 @@ + 'data' : '{userbase}', + }, + 'posix_user': { +- 'stdlib': '{userbase}/lib/python{py_version_short}', +- 'platstdlib': '{userbase}/lib/python{py_version_short}', +- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', ++ 'stdlib': '{userbase}/lib64/python{py_version_short}', ++ 'platstdlib': '{userbase}/lib64/python{py_version_short}', ++ 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages', ++ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', + 'include': '{userbase}/include/python{py_version_short}', + 'scripts': '{userbase}/bin', + 'data' : '{userbase}', +diff -uar Python-2.7.2.orig/Makefile.pre.in Python-2.7.2/Makefile.pre.in +--- Python-2.7.2.orig/Makefile.pre.in 2011-06-11 18:46:26.000000000 +0300 ++++ Python-2.7.2/Makefile.pre.in 2011-06-13 12:29:32.240106474 +0300 +@@ -97,7 +97,7 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -14,8 +111,9 @@ # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) ---- ./Modules/getpath.c.orig 2010-07-24 05:09:36.000000000 -0500 -+++ ./Modules/getpath.c 2010-11-27 17:23:13.000000000 -0600 +diff -uar Python-2.7.2.orig/Modules/getpath.c Python-2.7.2/Modules/getpath.c +--- Python-2.7.2.orig/Modules/getpath.c 2011-06-11 18:46:27.000000000 +0300 ++++ Python-2.7.2/Modules/getpath.c 2011-06-13 12:29:32.240106474 +0300 @@ -117,8 +117,8 @@ #endif @@ -36,7 +134,7 @@ static void reduce(char *dir) -@@ -524,7 +524,7 @@ +@@ -528,7 +528,7 @@ } else strncpy(zip_path, PREFIX, MAXPATHLEN); @@ -45,7 +143,7 @@ bufsz = strlen(zip_path); /* Replace "00" with version */ zip_path[bufsz - 6] = VERSION[0]; zip_path[bufsz - 5] = VERSION[2]; -@@ -534,7 +534,7 @@ +@@ -538,7 +538,7 @@ fprintf(stderr, "Could not find platform dependent libraries \n"); strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); @@ -54,44 +152,25 @@ } /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ ---- ./Modules/Setup.dist.orig 2008-11-27 04:15:12.000000000 -0600 -+++ ./Modules/Setup.dist 2010-11-27 17:21:23.000000000 -0600 -@@ -414,7 +414,7 @@ - #DB=/usr/local/BerkeleyDB.4.0 - #DBLIBVER=4.0 - #DBINC=$(DB)/include --#DBLIB=$(DB)/lib -+#DBLIB=$(DB)/lib64 - #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) - - # Historical Berkeley DB 1.85 -@@ -460,7 +460,7 @@ - # Andrew Kuchling's zlib module. - # This require zlib 1.1.3 (or later). - # See http://www.gzip.org/zlib/ --#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz -+#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz - - # Interface to the Expat XML parser - # ---- ./setup.py.orig 2010-07-17 07:31:09.000000000 -0500 -+++ ./setup.py 2010-11-27 17:21:23.000000000 -0600 -@@ -356,7 +356,7 @@ +diff -uar Python-2.7.2.orig/setup.py Python-2.7.2/setup.py +--- Python-2.7.2.orig/setup.py 2011-06-11 18:46:28.000000000 +0300 ++++ Python-2.7.2/setup.py 2011-06-13 12:29:32.241106466 +0300 +@@ -369,7 +369,7 @@ 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/lib64') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + self.add_multiarch_paths() - # Add paths specified in the environment variables LDFLAGS and -@@ -662,11 +662,11 @@ +@@ -677,11 +677,11 @@ elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/lib64/termcap'], - 'termcap'): +- ['/usr/lib/termcap'], ++ ['/usr/lib64/termcap'], + 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], @@ -99,7 +178,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -703,8 +703,8 @@ +@@ -715,8 +715,8 @@ if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, @@ -110,57 +189,3 @@ ] ) if (ssl_incs is not None and ---- ./Lib/distutils/command/install.py.orig 2008-05-06 17:41:46.000000000 -0500 -+++ ./Lib/distutils/command/install.py 2010-11-27 17:21:23.000000000 -0600 -@@ -42,14 +42,14 @@ - INSTALL_SCHEMES = { - 'unix_prefix': { - 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { - 'purelib': '$base/lib/python', -- 'platlib': '$base/lib/python', -+ 'platlib': '$base/lib64/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', ---- ./Lib/distutils/sysconfig.py.orig 2010-08-03 16:18:06.000000000 -0500 -+++ ./Lib/distutils/sysconfig.py 2010-11-27 17:21:23.000000000 -0600 -@@ -119,8 +119,12 @@ - prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": -+ if plat_specific or standard_lib: -+ lib = "lib64" -+ else: -+ lib = "lib" - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ lib, "python" + get_python_version()) - if standard_lib: - return libpython - else: ---- ./Lib/site.py.orig 2010-03-21 09:02:32.000000000 -0500 -+++ ./Lib/site.py 2010-11-27 17:21:23.000000000 -0600 -@@ -265,12 +265,16 @@ - if sys.platform in ('os2emx', 'riscos'): - sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': -+ sitedirs.append(os.path.join(prefix, "lib64", -+ "python" + sys.version[:3], -+ "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", - "python" + sys.version[:3], - "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", "site-python")) - else: - sitedirs.append(prefix) -+ sitedirs.append(os.path.join(prefix, "lib64", "site-packages")) - sitedirs.append(os.path.join(prefix, "lib", "site-packages")) - - if sys.platform == "darwin": -- cgit v1.2.3