[69278] trunk/dports/lang/pypy
jmr at macports.org
jmr at macports.org
Tue Jun 29 02:32:13 PDT 2010
Revision: 69278
http://trac.macports.org/changeset/69278
Author: jmr at macports.org
Date: 2010-06-29 02:32:09 -0700 (Tue, 29 Jun 2010)
Log Message:
-----------
pypy: update to 1.3
Modified Paths:
--------------
trunk/dports/lang/pypy/Portfile
Added Paths:
-----------
trunk/dports/lang/pypy/files/
trunk/dports/lang/pypy/files/darwin.py.diff
trunk/dports/lang/pypy/files/fix_cc.diff
Modified: trunk/dports/lang/pypy/Portfile
===================================================================
--- trunk/dports/lang/pypy/Portfile 2010-06-29 07:32:38 UTC (rev 69277)
+++ trunk/dports/lang/pypy/Portfile 2010-06-29 09:32:09 UTC (rev 69278)
@@ -4,7 +4,7 @@
PortSystem 1.0
name pypy
-version 1.2
+version 1.3
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang python devel
license MIT/PSF
@@ -22,18 +22,25 @@
use_bzip2 yes
distfiles ${name}-${version}-src${extract.suffix}
-checksums md5 d423bd7dfbfbcfebb8435e55bcb36516 \
- sha1 17d32765ce28a6fd3877fda003e5aceaf5f43511 \
- rmd160 162ba5c84728be032000c3c39bf3c26f069f9795
+checksums md5 9c87ff94885445d3aacfbd2617521222 \
+ sha1 ea84cef573c410bf3e898f18ddafc0198bf42328 \
+ rmd160 b4266fed91e0c7636ca589b3a9734cc57587ad70
+depends_build port:pkgconfig
depends_lib port:libffi \
port:python26
+patchfiles darwin.py.diff fix_cc.diff
+post-patch {
+ reinplace "s|__MDT__|${macosx_deployment_target}|g" ${worksrcpath}/pypy/translator/platform/darwin.py
+}
+
use_configure no
build.dir ${worksrcpath}/pypy/translator/goal
build.cmd arch -${build_arch} ${prefix}/bin/python2.6
build.args --batch --cc=${configure.cc} --opt=3 \
+ --make-jobs=${build.jobs} \
--cflags=\"${configure.cc_archflags} ${configure.cppflags} ${configure.ldflags}\"
build.target translate.py
build.post_args targetpypystandalone.py
Added: trunk/dports/lang/pypy/files/darwin.py.diff
===================================================================
--- trunk/dports/lang/pypy/files/darwin.py.diff (rev 0)
+++ trunk/dports/lang/pypy/files/darwin.py.diff 2010-06-29 09:32:09 UTC (rev 69278)
@@ -0,0 +1,55 @@
+--- pypy/translator/platform/darwin.py.orig 2010-06-13 07:55:19.000000000 +1000
++++ pypy/translator/platform/darwin.py 2010-06-29 12:41:59.000000000 +1000
+@@ -5,8 +5,8 @@
+ class Darwin(posix.BasePosix):
+ name = "darwin"
+
+- link_flags = ['-mmacosx-version-min=10.4']
+- cflags = ['-O3', '-fomit-frame-pointer', '-mmacosx-version-min=10.4']
++ link_flags = ['-mmacosx-version-min=__MDT__']
++ cflags = ['-O3', '-fomit-frame-pointer', '-mmacosx-version-min=__MDT__']
+ standalone_only = ['-mdynamic-no-pic']
+ shared_only = []
+
+@@ -23,21 +23,19 @@
+
+ def _preprocess_include_dirs(self, include_dirs):
+ res_incl_dirs = list(include_dirs)
+- res_incl_dirs.append('/usr/local/include') # Homebrew
+- res_incl_dirs.append('/opt/local/include') # MacPorts
+ return res_incl_dirs
+
+ def _preprocess_library_dirs(self, library_dirs):
+ res_lib_dirs = list(library_dirs)
+- res_lib_dirs.append('/usr/local/lib') # Homebrew
+- res_lib_dirs.append('/opt/local/lib') # MacPorts
+ return res_lib_dirs
+
+ def include_dirs_for_libffi(self):
+- return ['/usr/include/ffi']
++ return self._pkg_config("libffi", "--cflags-only-I",
++ ['/usr/include/ffi'])
+
+ def library_dirs_for_libffi(self):
+- return ['/usr/lib']
++ return self._pkg_config("libffi", "--libs-only-L",
++ ['/usr/lib'])
+
+ def check___thread(self):
+ # currently __thread is not supported by Darwin gccs
+@@ -69,11 +67,11 @@
+
+ class Darwin_i386(Darwin):
+ name = "darwin_i386"
+- link_flags = ['-arch', 'i386', '-mmacosx-version-min=10.4']
+- cflags = ['-arch', 'i386', '-O3', '-fomit-frame-pointer', '-mmacosx-version-min=10.4']
++ link_flags = ['-arch', 'i386', '-mmacosx-version-min=__MDT__']
++ cflags = ['-arch', 'i386', '-O3', '-fomit-frame-pointer', '-mmacosx-version-min=__MDT__']
+
+ class Darwin_x86_64(Darwin):
+ name = "darwin_x86_64"
+- link_flags = ['-arch', 'x86_64', '-mmacosx-version-min=10.4']
+- cflags = ['-arch', 'x86_64', '-O3', '-fomit-frame-pointer', '-mmacosx-version-min=10.4']
++ link_flags = ['-arch', 'x86_64', '-mmacosx-version-min=__MDT__']
++ cflags = ['-arch', 'x86_64', '-O3', '-fomit-frame-pointer', '-mmacosx-version-min=__MDT__']
+
Added: trunk/dports/lang/pypy/files/fix_cc.diff
===================================================================
--- trunk/dports/lang/pypy/files/fix_cc.diff (rev 0)
+++ trunk/dports/lang/pypy/files/fix_cc.diff 2010-06-29 09:32:09 UTC (rev 69278)
@@ -0,0 +1,71 @@
+Author: afa
+Date: Wed Jun 16 11:00:27 2010
+New Revision: 75419
+
+Modified:
+ pypy/trunk/pypy/translator/translator.py
+Log:
+Don't import the FlowObjSpace too early:
+among its dependencies is the rffi module, which needs the compiler to define its types.
+This causes problems when using the --cc option.
+
+(the change that broke --cc is r73857, in pyframe.py;
+but it feels more robust to defer the import in translator.py)
+
+
+Modified: pypy/trunk/pypy/translator/translator.py
+==============================================================================
+--- pypy/translator/translator.py (original)
++++ pypy/translator/translator.py Wed Jun 16 11:00:27 2010
+@@ -7,7 +7,6 @@
+ import autopath, os, sys, types, copy
+
+ from pypy.translator import simplify
+-from pypy.objspace.flow.objspace import FlowObjSpace
+ from pypy.objspace.flow.model import FunctionGraph, checkgraph, Block
+ from pypy.tool.ansi_print import ansi_log
+ from pypy.tool.sourcetools import nice_repr_for_func
+@@ -67,6 +66,7 @@
+ else:
+ if self.config.translation.verbose:
+ log.start(nice_repr_for_func(func))
++ from pypy.objspace.flow.objspace import FlowObjSpace
+ space = FlowObjSpace(self.flowconfig)
+ if self.annotator:
+ # ZZZ
+Author: afa
+Date: Wed Jun 16 11:31:00 2010
+New Revision: 75420
+
+Modified:
+ pypy/trunk/pypy/translator/goal/targetpreimportedpypy.py
+ pypy/trunk/pypy/translator/goal/targetpypystandalone.py
+Log:
+Remove unneeded import, and really fix --cc=<othercompiler>
+
+
+Modified: pypy/trunk/pypy/translator/goal/targetpreimportedpypy.py
+==============================================================================
+--- pypy/translator/goal/targetpreimportedpypy.py (original)
++++ pypy/translator/goal/targetpreimportedpypy.py Wed Jun 16 11:31:00 2010
+@@ -3,7 +3,6 @@
+ import os, sys
+ sys.setrecursionlimit(17000)
+
+-from pypy.objspace.std.objspace import StdObjSpace
+ from pypy.interpreter import gateway
+ from pypy.interpreter.error import OperationError
+ from pypy.translator.goal.ann_override import PyPyAnnotatorPolicy
+
+Modified: pypy/trunk/pypy/translator/goal/targetpypystandalone.py
+==============================================================================
+--- pypy/translator/goal/targetpypystandalone.py (original)
++++ pypy/translator/goal/targetpypystandalone.py Wed Jun 16 11:31:00 2010
+@@ -2,7 +2,6 @@
+
+ import os, sys
+
+-from pypy.objspace.std.objspace import StdObjSpace
+ from pypy.interpreter import gateway
+ from pypy.interpreter.error import OperationError
+ from pypy.translator.goal.ann_override import PyPyAnnotatorPolicy
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100629/80e3a71a/attachment.html>
More information about the macports-changes
mailing list