[32515] trunk/dports/lang/llvm

[erickt at macports.org]

Revision: 32515
          http://trac.macosforge.org/projects/macports/changeset/32515
Author:   erickt at macports.org
Date:     2008-01-05 21:22:43 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
version bump to llvm 2.1, and renaming llvm-gcc4 to llvm-gcc40 to reflect
that llvm supports multiple gcc versions.

Modified Paths:
--------------
    trunk/dports/lang/llvm/Portfile
    trunk/dports/lang/llvm-gcc4/Portfile
    trunk/dports/lang/llvm-gcc4/files/patch-gcc_Makefile.in

Modified: trunk/dports/lang/llvm/Portfile
===================================================================
--- trunk/dports/lang/llvm/Portfile	2008-01-06 01:20:25 UTC (rev 32514)
+++ trunk/dports/lang/llvm/Portfile	2008-01-06 05:22:43 UTC (rev 32515)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                    llvm
-version                 2.0
+version                 2.1
 categories              lang
 platforms               darwin
 maintainers             erickt at macports.org
@@ -14,9 +14,9 @@
 homepage                http://llvm.org/
 master_sites            http://llvm.org/releases/${version}/
 
-checksums               md5 6f88002301a25f31a492052695f6138e \
-                        sha1 530382974a3d8ab2343e426af2085d08aa430f3b \
-                        rmd160 72f0a5fb3921880786f4dc4263100d84188d0037
+checksums               md5 b930e7213b37acc934d0d163cf13af18 \
+                        sha1 e57081e1bc7c2cb168859f534c08b579276c3398 \
+                        rmd160 df28ee93be79b8d436deb7c0e1cff1c21e1328be
 
 depends_build           bin:flex:flex \
                         bin:bison:bison
@@ -27,12 +27,9 @@
     file mkdir ${workpath}/build
 }
 
-configure.cmd           ../llvm-${version}/configure
+configure.cmd           ../llvm-${version}/configure --enable-optimized
 
-build {
-    cd ${workpath}/build
-    system "make tools-only ENABLE_OPTIMIZED=1"
-}
+build.target            tools-only
 
 destroot.destdir        PROJ_prefix=${destroot}${prefix} \
                         PROJ_bindir=${destroot}${prefix}/bin \

Modified: trunk/dports/lang/llvm-gcc4/Portfile
===================================================================
--- trunk/dports/lang/llvm-gcc4/Portfile	2008-01-06 01:20:25 UTC (rev 32514)
+++ trunk/dports/lang/llvm-gcc4/Portfile	2008-01-06 05:22:43 UTC (rev 32515)
@@ -2,9 +2,10 @@
 
 PortSystem 1.0
 
-name                    llvm-gcc4
-version                 2.0
-revision                1
+set major               4.0
+
+name                    llvm-gcc40
+version                 2.1
 categories              lang
 platforms               darwin
 maintainers             erickt at macports.org
@@ -15,10 +16,10 @@
 homepage                http://llvm.org/
 master_sites            http://llvm.org/releases/${version}/
 
-distname                ${name}-${version}.source
-checksums               md5 648b6e1e73d770bbef2712b16a993548 \
-                        sha1 4731bd86094fae2799bfd7f2760a4a3b05e14e43 \
-                        rmd160 05eafd609990684a999f332bff782627cbe5cb50
+distname                llvm-gcc${major}-${version}.source
+checksums               md5 b2592f6d4010f7128ff29eb8bffa3896 \
+                        sha1 5e39d141c370d4c91d68b6aebf31f0a1f523f655 \
+                        rmd160 86d0d71dc9bf266a2715204cb2eee83dfa30ab2c
 
 depends_lib             port:llvm
 
@@ -30,7 +31,7 @@
 
 patchfiles              patch-gcc_Makefile.in
 
-configure.cmd           ../llvm-gcc4-${version}.source/configure
+configure.cmd           ../llvm-gcc${major}-${version}.source/configure
 
 configure.args-append   --enable-llvm=${prefix}/lib/llvm/obj \
                         --enable-languages=c,c++,objc,obj-c++ \
@@ -41,6 +42,7 @@
                         --mandir=${prefix}/share/man \
                         --with-local-prefix=${prefix} \
                         --program-prefix=llvm- \
+                        --program-suffix=-${major} \
                         --disable-nls
 
 destroot.destdir        prefix=${destroot}${prefix} \
@@ -60,7 +62,7 @@
 
 platform darwin {
   post-extract {
-    system "rm -rf ${workpath}/llvm-gcc4-${version}.source/libstdc++-v3"
+    system "rm -rf ${workpath}/llvm-gcc${major}-${version}.source/libstdc++-v3"
   }
 
   configure.args-append  --with-gxx-include-dir=/usr/include/c++/4.0.0

Modified: trunk/dports/lang/llvm-gcc4/files/patch-gcc_Makefile.in
===================================================================
--- trunk/dports/lang/llvm-gcc4/files/patch-gcc_Makefile.in	2008-01-06 01:20:25 UTC (rev 32514)
+++ trunk/dports/lang/llvm-gcc4/files/patch-gcc_Makefile.in	2008-01-06 05:22:43 UTC (rev 32515)
@@ -1,8 +1,8 @@
---- ../llvm-gcc4-2.0.source/gcc/Makefile.in.old	2007-08-08 21:09:17.000000000 -0700
-+++ ../llvm-gcc4-2.0.source/gcc/Makefile.in	2007-08-08 21:09:39.000000000 -0700
+--- ../llvm-gcc4.0-2.1.source/gcc/Makefile.in.old	2007-08-08 21:09:17.000000000 -0700
++++ ../llvm-gcc4.0-2.1.source/gcc/Makefile.in	2007-08-08 21:09:39.000000000 -0700
 @@ -3658,7 +3658,7 @@
  	-$(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
- 	-rm -f $(DESTDIR)$(bindir)/$(GCC_TARGET_INSTALL_NAME)-$(version)
+ 	-rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)$(exeext)
  	-( cd $(DESTDIR)$(bindir) && \
 -	   $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version) )
 +	   $(LN) $(GCC_INSTALL_NAME)$(exeext) $(GCC_TARGET_INSTALL_NAME)-$(version) )

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080105/1e420397/attachment.html