[105930] trunk/dports/lang/pypy
jmr at macports.org
jmr at macports.org
Fri May 10 03:44:10 PDT 2013
Revision: 105930
https://trac.macports.org/changeset/105930
Author: jmr at macports.org
Date: 2013-05-10 03:44:10 -0700 (Fri, 10 May 2013)
Log Message:
-----------
pypy: update to 2.0 (#39049), install pypy-c executable as 'pypy' (#37822)
Modified Paths:
--------------
trunk/dports/lang/pypy/Portfile
trunk/dports/lang/pypy/files/darwin.py.diff
trunk/dports/lang/pypy/files/make_output.diff
Modified: trunk/dports/lang/pypy/Portfile
===================================================================
--- trunk/dports/lang/pypy/Portfile 2013-05-10 05:53:10 UTC (rev 105929)
+++ trunk/dports/lang/pypy/Portfile 2013-05-10 10:44:10 UTC (rev 105930)
@@ -4,8 +4,7 @@
PortSystem 1.0
name pypy
-version 1.9
-set changeset 341e1e3821ff
+version 2.0
categories lang python devel
license MIT PSF
maintainers jmr openmaintainer
@@ -18,18 +17,20 @@
platforms darwin
homepage http://pypy.org/
-master_sites https://bitbucket.org/pypy/pypy/get/
+master_sites https://bitbucket.org/pypy/pypy/downloads/
use_bzip2 yes
-distname release-${version}
-worksrcdir ${name}-${name}-${changeset}
+distname ${name}-${version}-src
-checksums md5 f92c0171a9578a3e4a0f74947ec596ab \
- sha1 36a05432bbcee5d92a320fa27a627aeb281086b4 \
- rmd160 8ac2f53330ae450650f05753985bdbb42e07b526
+checksums md5 4dc82e2240dd2b5be313119672988538 \
+ sha1 d694824eeaa6169bce8d112149c9a5c7897534ed \
+ rmd160 e73661f303432a7b388e4c51b63f713a2c6eafd8
depends_build port:pkgconfig
depends_lib port:libffi \
- port:python27
+ port:sqlite3 \
+ port:bzip2 \
+ port:openssl \
+ port:gettext
patchfiles darwin.py.diff \
make_output.diff
@@ -37,11 +38,13 @@
use_configure no
# 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 {
+# disabled: crashes building 2.0 with 1.9
+#if {[file executable ${prefix}/lib/pypy/pypy-c]} {
+# build.cmd ${prefix}/lib/pypy/pypy-c
+#} else {
+ depends_build-append port:python27
build.cmd ${prefix}/bin/python2.7
-}
+#}
# a lot of memory is used before the C compiler even runs, so limit build.jobs
# according to available memory more tightly than the default
@@ -68,14 +71,15 @@
build.cmd arch -${build_arch} ${build.cmd}
}
}
-build.env PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix}
-build.dir ${worksrcpath}/pypy/translator/goal
+build.env PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix} \
+ CFLAGS="${configure.cc_archflags} ${configure.cppflags}" \
+ LDFLAGS="${configure.ld_archflags} ${configure.ldflags}"
+build.dir ${worksrcpath}/pypy/goal
build.args --batch --translation-verbose \
--cc=${configure.cc} --opt=jit \
- --make-jobs=${build.jobs} \
- --cflags='${configure.cc_archflags} ${configure.cppflags} ${configure.ldflags}'
-build.target translate.py
-build.post_args targetpypystandalone.py
+ --make-jobs=${build.jobs}
+build.target ../../rpython/bin/rpython
+build.post_args targetpypystandalone
# JIT is not available on powerpc at present
if {${os.arch} != "i386"} {
@@ -90,8 +94,8 @@
${destroot}${prefix}/lib/${name}
# library search paths changed quite inconveniently such that the binary
# won't run if it's in ${prefix}/bin
- xinstall -m 755 ${build.dir}/pypy-c ${destroot}${prefix}/lib/${name}
- ln -s ${prefix}/lib/${name}/pypy-c ${destroot}${prefix}/bin
+ xinstall -m 755 ${build.dir}/pypy-c ${destroot}${prefix}/lib/${name}/pypy
+ ln -s ${prefix}/lib/${name}/pypy ${destroot}${prefix}/bin
}
variant opt1 description {use optimization level 1 for faster build (but slower execution)} {
Modified: trunk/dports/lang/pypy/files/darwin.py.diff
===================================================================
--- trunk/dports/lang/pypy/files/darwin.py.diff 2013-05-10 05:53:10 UTC (rev 105929)
+++ trunk/dports/lang/pypy/files/darwin.py.diff 2013-05-10 10:44:10 UTC (rev 105930)
@@ -1,17 +1,36 @@
---- pypy/translator/platform/darwin.py.orig 2011-05-01 00:18:50.000000000 +1000
-+++ pypy/translator/platform/darwin.py 2011-05-02 06:53:52.000000000 +1000
-@@ -23,10 +23,12 @@
+--- rpython/translator/platform/darwin.py.orig 2013-05-09 19:07:56.000000000 +1000
++++ rpython/translator/platform/darwin.py 2013-05-10 16:44:29.000000000 +1000
+@@ -17,10 +17,10 @@
+ args)
-
+
def _include_dirs_for_libffi(self):
- return ['/usr/include/ffi']
-+ return self._pkg_config("libffi", "--cflags-only-I",
-+ ['/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'])
++ return self._pkg_config("libffi", "--libs-only-L", ['/usr/lib'])
- def check___thread(self):
- # currently __thread is not supported by Darwin gccs
+ def _frameworks(self, frameworks):
+ args = []
+@@ -51,9 +51,8 @@
+
+ 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')
++ cflags = ('-arch', 'i386', '-O3', '-fomit-frame-pointer')
+
+ class Darwin_PowerPC(Darwin):#xxx fixme, mwp
+ name = "darwin_powerpc"
+@@ -62,6 +61,5 @@
+
+ class Darwin_x86_64(Darwin):
+ name = "darwin_x86_64"
+- link_flags = ('-arch', 'x86_64', '-mmacosx-version-min=10.5')
+- cflags = ('-arch', 'x86_64', '-O3', '-fomit-frame-pointer',
+- '-mmacosx-version-min=10.5')
++ link_flags = ('-arch', 'x86_64')
++ cflags = ('-arch', 'x86_64', '-O3', '-fomit-frame-pointer')
Modified: trunk/dports/lang/pypy/files/make_output.diff
===================================================================
--- trunk/dports/lang/pypy/files/make_output.diff 2013-05-10 05:53:10 UTC (rev 105929)
+++ trunk/dports/lang/pypy/files/make_output.diff 2013-05-10 10:44:10 UTC (rev 105930)
@@ -1,14 +1,14 @@
---- pypy/translator/platform/posix.py.orig 2012-02-10 05:27:19.000000000 +1100
-+++ pypy/translator/platform/posix.py 2012-04-24 13:32:36.000000000 +1000
+--- rpython/translator/platform/posix.py.orig 2013-05-09 19:07:56.000000000 +1000
++++ rpython/translator/platform/posix.py 2013-05-10 16:46:49.000000000 +1000
@@ -1,6 +1,6 @@
"""Base support for POSIX-like platforms."""
-import py, os, sys
+import py, os, sys, subprocess
- from pypy.tool import autopath
- from pypy.translator.platform import Platform, log, _run_subprocess
-@@ -187,9 +187,9 @@
+ from rpython.translator.platform import Platform, log, _run_subprocess
+
+@@ -189,9 +189,9 @@
else:
path = path_to_makefile
log.execute('make %s in %s' % (" ".join(extra_opts), path))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130510/922975ac/attachment.html>
More information about the macports-changes
mailing list