Revision: 87473 http://trac.macports.org/changeset/87473 Author: jmr@macports.org Date: 2011-11-23 05:32:05 -0800 (Wed, 23 Nov 2011) Log Message: ----------- pypy: update to 1.7 Modified Paths: -------------- trunk/dports/lang/pypy/Portfile Removed Paths: ------------- trunk/dports/lang/pypy/files/darwin.py-archflags.diff Modified: trunk/dports/lang/pypy/Portfile =================================================================== --- trunk/dports/lang/pypy/Portfile 2011-11-23 12:23:41 UTC (rev 87472) +++ trunk/dports/lang/pypy/Portfile 2011-11-23 13:32:05 UTC (rev 87473) @@ -4,7 +4,7 @@ PortSystem 1.0 name pypy -version 1.6 +version 1.7 categories lang python devel license MIT PSF maintainers jmr openmaintainer @@ -22,8 +22,8 @@ distname release-${version} worksrcdir ${name}-${name}-release-${version} -checksums rmd160 74170120f53d13ed931b56ae8dbf1a27ec7649d3 \ - sha256 83060354ab1ea2a068e28ab2a61f0d17020e20530a3f83a46f4af0bb0751acac +checksums rmd160 f94199989fc7eab30d256b341367e82049b84745 \ + sha256 2e0884f4696cc8617be73cb8af8da063073d685b3d3e5de3366bfae4d33fac16 depends_build port:pkgconfig depends_lib port:libffi \ @@ -34,21 +34,19 @@ use_configure no # use pypy to build if it's already installed -# XXX 1.5 segfaults building 1.6 +# XXX 1.6 infinite loops and uses all memory building 1.7 #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... + +# gcc-4.2 seems to have issues still... +if {${configure.compiler} == "gcc-4.2"} { configure.compiler gcc-4.0 - # and Xcode 4 doesn't have gcc-4.0... - if {![file executable ${configure.cc}]} { - depends_lib-append port:gcc45 - configure.compiler macports-gcc-4.5 - patchfiles-append darwin.py-archflags.diff - } +} + +platform darwin { # use arch -foo if available if {${os.major} >= 9} { build.cmd arch -${build_arch} ${build.cmd} Deleted: trunk/dports/lang/pypy/files/darwin.py-archflags.diff =================================================================== --- trunk/dports/lang/pypy/files/darwin.py-archflags.diff 2011-11-23 12:23:41 UTC (rev 87472) +++ trunk/dports/lang/pypy/files/darwin.py-archflags.diff 2011-11-23 13:32:05 UTC (rev 87473) @@ -1,17 +0,0 @@ ---- pypy/translator/platform/darwin.py.orig 2011-08-26 11:44:13.000000000 +1000 -+++ pypy/translator/platform/darwin.py 2011-08-26 11:44:56.000000000 +1000 -@@ -70,10 +70,10 @@ - - class Darwin_i386(Darwin): - name = "darwin_i386" -- link_flags = ('-arch', 'i386') -- cflags = ('-arch', 'i386', '-O3', '-fomit-frame-pointer') -+ link_flags = ('-m32',) -+ cflags = ('-m32', '-O3', '-fomit-frame-pointer') - - class Darwin_x86_64(Darwin): - name = "darwin_x86_64" -- link_flags = ('-arch', 'x86_64') -- cflags = ('-arch', 'x86_64', '-O3', '-fomit-frame-pointer') -+ link_flags = ('-m64',) -+ cflags = ('-m64', '-O3', '-fomit-frame-pointer')