Gentoo Archives: gentoo-commits

From: "Dirkjan Ochtman (djc)" <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/pypy/files: 1.7-patches.patch 1.7-scripts-location.patch
Date: Wed, 30 Nov 2011 08:49:33
Message-Id: 20111130084918.5051B2004C@flycatcher.gentoo.org
1 djc 11/11/30 08:49:18
2
3 Added: 1.7-patches.patch 1.7-scripts-location.patch
4 Log:
5 Version bump pypy to 1.7 (bugs fixed: 379791, 383063, 373487).
6
7 (Portage version: 2.1.10.39/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-python/pypy/files/1.7-patches.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.7-patches.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.7-patches.patch?rev=1.1&content-type=text/plain
14
15 Index: 1.7-patches.patch
16 ===================================================================
17 --- pypy-pypy-release-1.7/pypy/translator/goal/translate.py.bak 2011-11-29 14:23:55.000000000 +0100
18 +++ pypy-pypy-release-1.7/pypy/translator/goal/translate.py 2011-11-29 14:24:16.000000000 +0100
19 @@ -255,8 +255,6 @@
20 log.event("batch mode, not calling interactive helpers")
21 return
22
23 - log.event("start debugger...")
24 -
25 if translateconfig.view:
26 try:
27 t1 = drv.hint_translator
28 @@ -266,8 +264,6 @@
29 page = graphpage.TranslatorPage(t1, translateconfig.huge)
30 page.display_background()
31
32 - pdb_plus_show.start(tb)
33 -
34 try:
35 drv = driver.TranslationDriver.from_targetspec(targetspec_dic, config, args,
36 empty_translator=t,
37 --- pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py.bak 2011-11-29 14:22:29.000000000 +0100
38 +++ pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py 2011-11-29 14:22:55.000000000 +0100
39 @@ -1694,6 +1694,7 @@
40 }
41 """
42 elif self.format in ('elf64', 'darwin64'):
43 + print >> output, "\t.section .note.GNU-stack,\"\",%progbits"
44 print >> output, "\t.text"
45 print >> output, "\t.globl %s" % _globalname('pypy_asm_stackwalk')
46 _variant(elf64='.type pypy_asm_stackwalk, @function',
47 --- pypy-pypy-release-1.7/pypy/rlib/ropenssl.py.bak 2011-11-29 14:19:10.000000000 +0100
48 +++ pypy-pypy-release-1.7/pypy/rlib/ropenssl.py 2011-11-29 14:19:42.000000000 +0100
49 @@ -159,6 +159,7 @@
50 lltype.Void)
51
52 if HAVE_OPENSSL_RAND:
53 + eci.includes = eci.includes + ('openssl/rand.h',)
54 ssl_external('RAND_add', [rffi.CCHARP, rffi.INT, rffi.DOUBLE], lltype.Void)
55 ssl_external('RAND_status', [], rffi.INT)
56 ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT)
57
58
59
60 1.1 dev-python/pypy/files/1.7-scripts-location.patch
61
62 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.7-scripts-location.patch?rev=1.1&view=markup
63 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.7-scripts-location.patch?rev=1.1&content-type=text/plain
64
65 Index: 1.7-scripts-location.patch
66 ===================================================================
67 --- pypy-pypy-release-1.7/lib-python/modified-2.7/distutils/command/install.py
68 +++ pypy-pypy-release-1.7/lib-python/modified-2.7/distutils/command/install.py
69 @@ -87,7 +87,7 @@
70 'purelib': '$base/site-packages',
71 'platlib': '$base/site-packages',
72 'headers': '$base/include',
73 - 'scripts': '$base/bin',
74 + 'scripts': '/usr/bin',
75 'data' : '$base',
76 },
77 }