Changeset 82942

Timestamp:

08/22/11 04:24:21 (4 years ago)

Author:

jmr@…

Message:

pypy: update to 1.6 (#30888)

Location:

trunk/dports/lang/pypy

Files:

• Portfile (modified) (4 diffs)
• files/darwin.py.diff (modified) (1 diff)

trunk/dports/lang/pypy/Portfile

@@ -5 +5 @@
 
 name                pypy
-version             1.5
+version             1.6
 categories          lang python devel
 license             MIT PSF
@@ -18 +18 @@
 
 homepage            http://pypy.org/
-master_sites        http://pypy.org/download/
+master_sites        https://bitbucket.org/pypy/pypy/get/
 use_bzip2           yes
-distname            ${name}-${version}-src
+distname            release-${version}
+worksrcdir          ${name}-${name}-release-${version}
 
-checksums           md5 cb9ada2c50666318c3a2863da1fbe487 \
-                    sha1 0ebcecaa4c725bf1a48272033d9f429b8a82b7e1 \
-                    rmd160 9c7d479ac5cd51c3789f3db99674b4c2936d88e0
+checksums           rmd160 74170120f53d13ed931b56ae8dbf1a27ec7649d3 \
+                    sha256 83060354ab1ea2a068e28ab2a61f0d17020e20530a3f83a46f4af0bb0751acac
 
 depends_build       port:pkgconfig
@@ -31 +31 @@
 
 patchfiles          darwin.py.diff
-post-patch {
-    reinplace "s|__MDT__|${macosx_deployment_target}|g" ${worksrcpath}/pypy/translator/platform/darwin.py
-}
 
 use_configure       no
 
-platform darwin 10 {
-    # 4.2 is known not to work, sigh...
+# use pypy to build if it's already installed
+# XXX 1.5 segfaults building 1.6
+#if {[file executable ${prefix}/lib/pypy/pypy-c]} {
+#    build.cmd       ${prefix}/lib/pypy/pypy-c
+#} else {
+    build.cmd       ${prefix}/bin/python2.7
+#}
+platform darwin {
+    # gcc-4.2 and llvm are known not to work, sigh...
     configure.compiler gcc-4.0
     # and Xcode 4 doesn't have gcc-4.0...
-    pre-fetch {
-        if {![file executable ${configure.cc}]} {
-            ui_error "$name must be compiled with ${configure.compiler}"
-            error "${configure.cc} not found"
-        }
+    if {![file executable ${configure.cc}]} {
+        depends_lib-append port:gcc45
+        configure.compiler macports-gcc-4.5
+    }
+    # use arch -foo if available
+    if {${os.major} >= 9} {
+        build.cmd arch -${build_arch} ${build.cmd}
     }
 }
-
 build.dir           ${worksrcpath}/pypy/translator/goal
-# use pypy to build if it's already installed
-if {[file executable ${prefix}/lib/pypy/pypy-c]} {
-    build.cmd       ${prefix}/lib/pypy/pypy-c
-} else {
-    build.cmd       ${prefix}/bin/python2.7
-}
 build.args          --batch --cc=${configure.cc} --opt=jit \
                     --make-jobs=${build.jobs} \
@@ -66 +65 @@
     build.args-delete --opt=jit
     build.args-append --opt=3
-}
-
-platform darwin {
-    # use arch -foo if available
-    if {${os.major} >= 9} {
-        build.cmd arch -${build_arch} ${build.cmd}
-    }
 }
 

trunk/dports/lang/pypy/files/darwin.py.diff

@@ -16 +16 @@
      def check___thread(self):
          # currently __thread is not supported by Darwin gccs
-@@ -68,12 +70,12 @@
- 
- class Darwin_i386(Darwin):
-     name = "darwin_i386"
--    link_flags = ('-arch', 'i386', '-mmacosx-version-min=10.4')
-+    link_flags = ('-arch', 'i386', '-mmacosx-version-min=__MDT__')
-     cflags = ('-arch', 'i386', '-O3', '-fomit-frame-pointer',
--              '-mmacosx-version-min=10.4')
-+              '-mmacosx-version-min=__MDT__')
- 
- class Darwin_x86_64(Darwin):
-     name = "darwin_x86_64"
--    link_flags = ('-arch', 'x86_64', '-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=10.4')
-+              '-mmacosx-version-min=__MDT__')