[113978] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Tue Nov 26 15:15:49 PST 2013


Revision: 113978
          https://trac.macports.org/changeset/113978
Author:   jeremyhu at macports.org
Date:     2013-11-26 15:15:49 -0800 (Tue, 26 Nov 2013)
Log Message:
-----------
{clang,dragonegg,llvm}-3.4: Bump to current 3.4

Modified Paths:
--------------
    trunk/dports/lang/dragonegg-3.4/Portfile
    trunk/dports/lang/llvm-3.4/Portfile
    trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch

Modified: trunk/dports/lang/dragonegg-3.4/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.4/Portfile	2013-11-26 22:10:51 UTC (rev 113977)
+++ trunk/dports/lang/dragonegg-3.4/Portfile	2013-11-26 23:15:49 UTC (rev 113978)
@@ -77,7 +77,7 @@
 depends_skip_archcheck-append gcc${gcc_version_no_dot}
 
 fetch.type              svn
-svn.revision            193941
+svn.revision            195772
 version                 ${llvm_version}-r${svn.revision}
 worksrcdir              trunk
 svn.url                 http://llvm.org/svn/llvm-project/dragonegg/trunk

Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile	2013-11-26 22:10:51 UTC (rev 113977)
+++ trunk/dports/lang/llvm-3.4/Portfile	2013-11-26 23:15:49 UTC (rev 113978)
@@ -49,16 +49,16 @@
 }
 
 fetch.type              svn
-svn.revision            193941
+svn.revision            195772
 
 set compiler_rt_rev     ${svn.revision}
 set libcxx_rev          ${svn.revision}
 version                 ${llvm_version}-r${svn.revision}
 revision                0
-worksrcdir              trunk
-svn.url                 http://llvm.org/svn/llvm-project/llvm/trunk
-#worksrcdir              release_34
-#svn.url                 http://llvm.org/svn/llvm-project/llvm/branches/release_34
+#worksrcdir              trunk
+#svn.url                 http://llvm.org/svn/llvm-project/llvm/trunk
+worksrcdir              release_34
+svn.url                 http://llvm.org/svn/llvm-project/llvm/branches/release_34
 default_variants-append +assertions
 
 #version                 ${llvm_version}
@@ -69,7 +69,8 @@
 #worksrcdir              llvm-${version}.src
 
 patchfiles      install_target.patch \
-                tiger-shlib.patch
+                tiger-shlib.patch \
+                BlockFrequencyTest.cpp.patch
 
 patch.pre_args  -p1
 
@@ -173,16 +174,16 @@
 
 post-extract {
     if {${subport} == "clang-${llvm_version}"} {
-        system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
-        #system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_34 clang"
+        #system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
+        system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_34 clang"
         #file rename ${workpath}/clang-${llvm_version}.src ${worksrcpath}/tools/clang
 
-        system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
-        #system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_34 compiler-rt"
+        #system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
+        system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_34 compiler-rt"
         #file rename ${workpath}/compiler-rt-${llvm_version}.src ${worksrcpath}/projects/compiler-rt
 
-        system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
-        #system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_34 libcxx"
+        #system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
+        system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_34 libcxx"
         #file rename ${workpath}/libcxx-${llvm_version}.src ${worksrcpath}/projects/libcxx
     }
 }

Modified: trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch	2013-11-26 22:10:51 UTC (rev 113977)
+++ trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch	2013-11-26 23:15:49 UTC (rev 113978)
@@ -2,33 +2,26 @@
 ===================================================================
 --- llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk	(revision 185755)
 +++ llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk	(working copy)
-@@ -70,12 +70,12 @@
+@@ -81,8 +81,8 @@ Configs += profile_ios
  UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
  
  # Configurations which define the ASAN support functions.
--Configs += asan_osx
--UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx)
-+#Configs += asan_osx
-+#UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx)
-+#
+-Configs += asan_osx_dynamic
+-UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
 +#Configs += asan_osx_dynamic
 +#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
  
--Configs += asan_osx_dynamic
--UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
--
  Configs += ubsan_osx
  UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
- 
 Index: llvm-3.3/tools/clang/runtime/compiler-rt/Makefile
 ===================================================================
---- llvm-3.3/tools/clang/runtime/compiler-rt/Makefile	(revision 185755)
-+++ llvm-3.3/tools/clang/runtime/compiler-rt/Makefile	(working copy)
-@@ -75,7 +75,6 @@
+--- llvm-3.4/tools/clang/runtime/compiler-rt/Makefile	(revision 185755)
++++ llvm-3.4/tools/clang/runtime/compiler-rt/Makefile	(working copy)
+@@ -77,7 +77,6 @@ ifeq ($(OS),Darwin)
  RuntimeDirs += darwin
  RuntimeLibrary.darwin.Configs := \
  	eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
--	asan_osx.a asan_osx_dynamic.dylib \
+-	asan_osx_dynamic.dylib \
  	profile_osx.a profile_ios.a \
  	ubsan_osx.a
  endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131126/6062de13/attachment-0001.html>


More information about the macports-changes mailing list