diff --git a/programming/language/python3/actions.py b/programming/language/python3/actions.py index 62a177f369..950ad3ad65 100644 --- a/programming/language/python3/actions.py +++ b/programming/language/python3/actions.py @@ -23,19 +23,16 @@ def setup(): autotools.rawConfigure("\ --prefix=/usr \ - --enable-ipv6 \ - --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-threads \ --with-computed-gotos \ - --with-dbmliborder=gdbm:ndbm \ - --with-fpectl \ + --enable-ipv6 \ --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ --with-system-ffi \ --with-system-libmpdec \ - --with-threads \ - --with-valgrind \ - --without-ensurepip \ - ") + --enable-loadable-sqlite-extensions \ + --without-ensurepip") def build(): autotools.make() diff --git a/programming/language/python3/files/Python-3.1.1-rpath.patch b/programming/language/python3/files/Python-3.1.1-rpath.patch deleted file mode 100644 index 1493af2957..0000000000 --- a/programming/language/python3/files/Python-3.1.1-rpath.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up Python-3.1.1/Lib/distutils/unixccompiler.py.rpath Python-3.1.1/Lib/distutils/unixccompiler.py ---- Python-3.1.1/Lib/distutils/unixccompiler.py.rpath 2009-09-04 17:29:34.000000000 -0400 -+++ Python-3.1.1/Lib/distutils/unixccompiler.py 2009-09-04 17:49:54.000000000 -0400 -@@ -141,6 +141,16 @@ class UnixCCompiler(CCompiler): - if sys.platform == "cygwin": - exe_extension = ".exe" - -+ def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs): -+ """Remove standard library path from rpath""" -+ libraries, library_dirs, runtime_library_dirs = super( -+ self.__class__, self)._fix_lib_args(libraries, library_dirs, -+ runtime_library_dirs) -+ libdir = sysconfig.get_config_var('LIBDIR') -+ if runtime_library_dirs and (libdir in runtime_library_dirs): -+ runtime_library_dirs.remove(libdir) -+ return libraries, library_dirs, runtime_library_dirs -+ - def preprocess(self, source, output_file=None, macros=None, - include_dirs=None, extra_preargs=None, extra_postargs=None): - fixed_args = self._fix_compile_args(None, macros, include_dirs) diff --git a/programming/language/python3/files/dont-make-libpython-readonly.patch b/programming/language/python3/files/dont-make-libpython-readonly.patch new file mode 100644 index 0000000000..92308bfe97 --- /dev/null +++ b/programming/language/python3/files/dont-make-libpython-readonly.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.pre.in b/Makefile.pre.in +index ce2c0aa..7d6dcf7 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -60,7 +60,7 @@ INSTALL_DATA= @INSTALL_DATA@ + # Shared libraries must be installed with executable mode on some systems; + # rather than figuring out exactly which, we always give them executable mode. + # Also, making them read-only seems to be a good idea... +-INSTALL_SHARED= ${INSTALL} -m 555 ++INSTALL_SHARED= ${INSTALL} -m 755 + + MKDIR_P= @MKDIR_P@ + diff --git a/programming/language/python3/pspec.xml b/programming/language/python3/pspec.xml index ce4b4cb888..891f6e6b70 100644 --- a/programming/language/python3/pspec.xml +++ b/programming/language/python3/pspec.xml @@ -30,7 +30,7 @@ readline-devel - Python-3.1.1-rpath.patch + dont-make-libpython-readonly.patch