[74652] trunk/dports/lang/pypy

26 Dec 2010

Revision: 74652
          http://trac.macports.org/changeset/74652
Author:   jmr@macports.org
Date:     2010-12-26 10:19:12 -0800 (Sun, 26 Dec 2010)
Log Message:
-----------
pypy: update to 1.4.1

Modified Paths:
--------------
    trunk/dports/lang/pypy/Portfile
    trunk/dports/lang/pypy/files/darwin.py.diff

Modified: trunk/dports/lang/pypy/Portfile
===================================================================

--- trunk/dports/lang/pypy/Portfile	2010-12-26 18:05:23 UTC (rev 74651)
+++ trunk/dports/lang/pypy/Portfile	2010-12-26 18:19:12 UTC (rev 74652)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                pypy
-version             1.4
+version             1.4.1
 categories          lang python devel
 license             MIT/PSF
 maintainers         jmr openmaintainer
@@ -19,11 +19,11 @@
 homepage            http://pypy.org/
 master_sites        http://pypy.org/download/
 use_bzip2           yes
-distfiles           ${name}-${version}-src${extract.suffix}
+distname            ${name}-${version}-src
 
-checksums           md5 6c7e5a3fab4b3f6357aab84927420b49 \
-                    sha1 22cb3d9d4ecf6a8d1094708df7cfe5633f848d22 \
-                    rmd160 06a3f2a5a8d9d817158420b5a8283758fe58b134
+checksums           md5 ebbbb156b1eb842e9e65d909ed5f9f6d \
+                    sha1 922a8815377fe2e0c015338fa8b28ae16bf8c840 \
+                    rmd160 9f54887650fc8411c6f779cb56c0ee8cfa78efa1
 
 depends_build       port:pkgconfig
 depends_lib         port:libffi \
@@ -42,11 +42,15 @@
 }
 
 build.dir           ${worksrcpath}/pypy/translator/goal
-# next release (after 1.4) should use pypy to build if it's already installed
-build.cmd           ${prefix}/bin/python2.6
+# 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.6
+}
 build.args          --batch --cc=${configure.cc} --opt=jit \
                     --make-jobs=${build.jobs} \
-                    --cflags=\"${configure.cc_archflags} ${configure.cppflags} ${configure.ldflags}\"
+                    --cflags='${configure.cc_archflags} ${configure.cppflags} ${configure.ldflags}'
 build.target        translate.py
 build.post_args     targetpypystandalone.py
 

Modified: trunk/dports/lang/pypy/files/darwin.py.diff
===================================================================
--- trunk/dports/lang/pypy/files/darwin.py.diff	2010-12-26 18:05:23 UTC (rev 74651)
+++ trunk/dports/lang/pypy/files/darwin.py.diff	2010-12-26 18:19:12 UTC (rev 74652)
@@ -11,7 +11,7 @@
      standalone_only = ('-mdynamic-no-pic',)
      shared_only = ()
  
-@@ -29,21 +29,19 @@
+@@ -31,21 +31,19 @@
      
      def _preprocess_include_dirs(self, include_dirs):
          res_incl_dirs = list(include_dirs)
@@ -37,7 +37,7 @@
  
      def check___thread(self):
          # currently __thread is not supported by Darwin gccs
-@@ -78,13 +76,13 @@
+@@ -80,12 +78,12 @@
  
  class Darwin_i386(Darwin):
      name = "darwin_i386"
@@ -54,4 +54,3 @@
      cflags = ('-arch', 'x86_64', '-O3', '-fomit-frame-pointer',
 -              '-mmacosx-version-min=10.4')
 +              '-mmacosx-version-min=__MDT__')
-     default_cc = 'gcc-4.0'

    

[74652] trunk/dports/lang/pypy

jmr＠macports.org