[patch] pypy.patch

pypy.patch (text/plain), 1.93 KB, created by Benda Xu on 2012-06-11 03:02:41 UTC

diff -Naurp pypy.old/files/pypy-1.9-no-static-hack.patch pypy/files/pypy-1.9-no-static-hack.patch
--- pypy.old/files/pypy-1.9-no-static-hack.patch	1970-01-01 09:00:00.000000000 +0900
+++ pypy/files/pypy-1.9-no-static-hack.patch	2012-06-10 17:35:47.000000000 +0900
@@ -0,0 +1,22 @@
+--- pypy/rlib/ropenssl.py	2012-06-07 21:24:48.000000000 +0900
++++ pypy/rlib/ropenssl.py.new	2012-06-10 17:28:29.000000000 +0900
+@@ -19,18 +19,8 @@ if sys.platform == 'win32' and platform.
+         # so that openssl/ssl.h can repair this nonsense.
+         'wincrypt.h']
+ else:
+-    libraries = ['z']
++    libraries = ['z', 'ssl', 'crypto']
+     includes = []
+-    if (sys.platform.startswith('linux') and
+-        os.path.exists('/usr/lib/libssl.a') and
+-        os.path.exists('/usr/lib/libcrypto.a')):
+-        # use static linking to avoid the infinite
+-        # amount of troubles due to symbol versions
+-        # and 0.9.8/1.0.0
+-        link_files += ['/usr/lib/libssl.a', '/usr/lib/libcrypto.a']
+-        testonly_libraries += ['ssl', 'crypto']
+-    else:
+-        libraries += ['ssl', 'crypto']
+ 
+ includes += [
+     'openssl/ssl.h', 
diff -Naurp pypy.old/pypy-1.9.ebuild pypy/pypy-1.9.ebuild
--- pypy.old/pypy-1.9.ebuild	2012-06-09 01:52:09.000000000 +0900
+++ pypy/pypy-1.9.ebuild	2012-06-10 19:35:34.000000000 +0900
@@ -14,7 +14,7 @@ SLOTVER=$(get_version_component_range 1-
 LICENSE="MIT"
 SLOT="${SLOTVER}"
 PYTHON_ABI="2.7-pypy-${SLOTVER}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
@@ -46,6 +46,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-scripts-location.patch"
 	epatch "${FILESDIR}/${PV}-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	epatch "${FILESDIR}/${PV}-distutils-fix_handling_of_executables_and_flags.patch"
+	epatch "${FILESDIR}/${P}-no-static-hack.patch"
 }
 
 src_compile() {