[60440] trunk/dports/lang

[erickt at macports.org]

Revision: 60440
          http://trac.macports.org/changeset/60440
Author:   erickt at macports.org
Date:     2009-11-12 08:20:19 -0800 (Thu, 12 Nov 2009)
Log Message:
-----------
Version bump for llvm and llvm-gcc-4.2.

Modified Paths:
--------------
    trunk/dports/lang/llvm/Portfile
    trunk/dports/lang/llvm-gcc42/Portfile

Modified: trunk/dports/lang/llvm/Portfile
===================================================================
--- trunk/dports/lang/llvm/Portfile	2009-11-12 16:05:30 UTC (rev 60439)
+++ trunk/dports/lang/llvm/Portfile	2009-11-12 16:20:19 UTC (rev 60440)
@@ -1,10 +1,9 @@
-# $Id$
+# $Id: Portfile 58531 2009-09-30 11:48:05Z nox at macports.org $
 
 PortSystem 1.0
 
 name                    llvm
-version                 2.5
-revision                1
+version                 2.6
 categories              lang
 platforms               darwin
 use_parallel_build      yes
@@ -16,15 +15,12 @@
 homepage                http://llvm.org/
 master_sites            ${homepage}releases/${version}/
 
-checksums               md5     55df2ea8665c8094ad2ef85187b9fc74 \
-                        sha1    67f4bace9e64cc39255583aa837470d9b9de0aa5 \
-                        rmd160  2c904b8d0bcce565ed11114b921321a0404e23fe
+checksums               md5     34a11e807add0f4555f691944e1a404a \
+                        sha1    547471147cbf6d3e49539e01196ffada2c79c250 \
+                        rmd160  24d58cb052ab5879aae59eaf4885ec41186ee22a
 
 universal_variant       no
 
-depends_build           bin:flex:flex \
-                        bin:bison:bison
-
 configure.dir           ${workpath}/build
 build.dir               ${configure.dir}
 destroot.dir            ${configure.dir}
@@ -40,7 +36,10 @@
 configure.ldflags
 configure.cmd           ${worksrcpath}/configure
 configure.args          --enable-optimized --enable-jit \
-                        --enable-bindings=none
+                        --enable-bindings=none \
+                        --disable-assertions \
+			                  --disable-pic
+			                  #pic is enabled by default in 2.6
 
 post-destroot {
     file mkdir ${destroot}${prefix}/lib/llvm
@@ -49,12 +48,12 @@
 
     file copy ${worksrcpath}/include ${destroot}${prefix}/lib/llvm/src
     file copy ${configure.dir}/include ${destroot}${prefix}/lib/llvm/obj
-    file copy ${configure.dir}/Release ${destroot}${prefix}/lib/llvm/obj
+    file copy ${configure.dir}/Release-Asserts ${destroot}${prefix}/lib/llvm/obj
 
     reinplace "s|${worksrcpath}|${prefix}/lib/llvm/src|g"       ${destroot}${prefix}/bin/llvm-config \
-                                                                ${destroot}${prefix}/lib/llvm/obj/Release/bin/llvm-config
+                                                                ${destroot}${prefix}/lib/llvm/obj/Release-Asserts/bin/llvm-config
     reinplace "s|${configure.dir}|${prefix}/lib/llvm/obj|g"     ${destroot}${prefix}/bin/llvm-config \
-                                                                ${destroot}${prefix}/lib/llvm/obj/Release/bin/llvm-config
+                                                                ${destroot}${prefix}/lib/llvm/obj/Release-Asserts/bin/llvm-config
 
     fs-traverse item ${destroot} {
         if {[file isfile ${item}] && ".dir" == [file tail ${item}]} {
@@ -74,5 +73,9 @@
 }
 
 variant pic description {Enable generation of position independent code} {
-    configure.args-append --enable-pic
+    configure.args-delete --disable-pic
 }
+
+variant host_only description {Disables non-host targets} {
+    configure.args-append --enable-targets=host-only
+}

Modified: trunk/dports/lang/llvm-gcc42/Portfile
===================================================================
--- trunk/dports/lang/llvm-gcc42/Portfile	2009-11-12 16:05:30 UTC (rev 60439)
+++ trunk/dports/lang/llvm-gcc42/Portfile	2009-11-12 16:20:19 UTC (rev 60440)
@@ -5,7 +5,7 @@
 set major               4.2
 
 name                    llvm-gcc42
-version                 2.5
+version                 2.6
 categories              lang
 platforms               darwin
 maintainers             erickt openmaintainer
@@ -18,9 +18,9 @@
 
 distname                llvm-gcc-${major}-${version}.source
 
-checksums		md5 c5800d85059fcf80429a86c536127595 \
-			sha1 5c2f0f1341868d8cdeb2eb4efdf9bf35c63526cb \
-			rmd160 6d93b4024e5caa42396f536935800ce1a02423e4
+checksums               md5     4e8c5a1035701c231dbfc7e2af2d7571 \
+                        sha1    60670d550be09a57d315efa259d2b19955f6fa79 \
+                        rmd160  08d7ffadb88e3abdcc971372f737e4ddf8f991c6
 
 depends_lib             port:llvm
 
@@ -30,11 +30,28 @@
   file mkdir ${workpath}/build
 }
 
+# the generated compiler doesn't accept -arch
+if {[info exists build_arch] && ${os.platform} == "darwin"} {
+    if {(${os.arch} == "i386" && $build_arch == "i386") || (${os.arch} == "powerpc" && $build_arch == "ppc")} {
+        configure.env-append CFLAGS_FOR_TARGET="-m32 ${configure.cflags}"
+    } elseif {(${os.arch} == "i386" && $build_arch == "x86_64") || (${os.arch} == "powerpc" && $build_arch == "ppc64")} {
+        configure.env-append CFLAGS_FOR_TARGET="-m64 ${configure.cflags}"
+    } else {
+        pre-fetch {
+            return -code error "Cannot build $name for $build_arch"
+        }
+    }
+    configure.env-append CFLAGS_FOR_BUILD="${configure.cc_archflags} ${configure.cflags}"
+    configure.cc_archflags
+    configure.cxx_archflags
+    configure.objc_archflags
+}
+
 configure.cmd           ../llvm-gcc${major}-${version}.source/configure
 
 configure.args-append   --enable-llvm=${prefix}/lib/llvm/obj \
                         --enable-languages=c,c++,objc,obj-c++ \
-												--mandir=${prefix}/share/man \
+                        --mandir=${prefix}/share/man \
                         --infodir=${prefix}/share/info \
                         --program-prefix=llvm- \
                         --program-suffix=-${major}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091112/02f22ca6/attachment.html>