[98721] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Sat Oct 13 12:05:59 PDT 2012 

Revision: 98721
          http://trac.macports.org//changeset/98721
Author:   jeremyhu at macports.org
Date:     2012-10-13 12:05:58 -0700 (Sat, 13 Oct 2012)
Log Message:
-----------
llvm-3.2: Update to r165785

Revision Links:
--------------
    http://trac.macports.org//changeset/165785

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

Modified: trunk/dports/lang/dragonegg-3.2/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.2/Portfile	2012-10-13 19:05:39 UTC (rev 98720)
+++ trunk/dports/lang/dragonegg-3.2/Portfile	2012-10-13 19:05:58 UTC (rev 98721)
@@ -30,7 +30,7 @@
 depends_skip_archcheck-append gcc${gcc_version}
 
 fetch.type              svn
-svn.revision            163485
+svn.revision            165785
 version                 ${llvm_version}-r${svn.revision}
 worksrcdir              trunk
 svn.url                 http://llvm.org/svn/llvm-project/dragonegg/trunk

Modified: trunk/dports/lang/llvm-3.2/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.2/Portfile	2012-10-13 19:05:39 UTC (rev 98720)
+++ trunk/dports/lang/llvm-3.2/Portfile	2012-10-13 19:05:58 UTC (rev 98721)
@@ -48,7 +48,7 @@
 }
 
 fetch.type              svn
-svn.revision            164372
+svn.revision            165785 
 set compiler_rt_rev     ${svn.revision}
 set libcxx_rev          ${svn.revision}
 version                 ${llvm_version}-r${svn.revision}
@@ -194,6 +194,9 @@
         if {![variant_isset arm_runtime]} {
             reinplace {/^SubDirs/ s/arm//} ${worksrcpath}/projects/compiler-rt/lib/Makefile.mk
             reinplace {/^UniversalArchs/ s/arm[^ )]* *//g} ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk
+
+            reinplace {/cc_kext_ios5/ s/^/#/} ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk
+            reinplace {s/cc_kext_ios5.a//} ${worksrcpath}/tools/clang/runtime/compiler-rt/Makefile
         }
     }
 }

Modified: trunk/dports/lang/llvm-3.2/files/leopard-no-asan.patch
===================================================================
--- trunk/dports/lang/llvm-3.2/files/leopard-no-asan.patch	2012-10-13 19:05:39 UTC (rev 98720)
+++ trunk/dports/lang/llvm-3.2/files/leopard-no-asan.patch	2012-10-13 19:05:58 UTC (rev 98721)
@@ -1,5 +1,6 @@
---- projects/compiler-rt/make/platform/clang_darwin.mk.orig	2012-09-09 12:50:49.000000000 -0700
-+++ projects/compiler-rt/make/platform/clang_darwin.mk	2012-09-09 12:51:36.000000000 -0700
+diff -Naurp trunk.orig/projects/compiler-rt/make/platform/clang_darwin.mk trunk/projects/compiler-rt/make/platform/clang_darwin.mk
+--- a/projects/compiler-rt/make/platform/clang_darwin.mk	2012-10-11 21:56:32.000000000 -0700
++++ b/projects/compiler-rt/make/platform/clang_darwin.mk	2012-10-11 22:03:39.000000000 -0700
 @@ -58,11 +58,11 @@ Configs += profile_osx
  UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64,profile_osx)
  
@@ -37,9 +38,9 @@
  
  # Configure the asan_osx_dynamic library to be built shared.
 -SHARED_LIBRARY.asan_osx_dynamic := 1
--LDFLAGS.asan_osx_dynamic := -framework Foundation -lc++
+-LDFLAGS.asan_osx_dynamic := -framework Foundation -lstdc++
 +#SHARED_LIBRARY.asan_osx_dynamic := 1
-+#LDFLAGS.asan_osx_dynamic := -framework Foundation -lc++
++#LDFLAGS.asan_osx_dynamic := -framework Foundation -lstdc++
  
  FUNCTIONS.eprintf := eprintf
  FUNCTIONS.10.4 := eprintf floatundidf floatundisf floatundixf
@@ -60,15 +61,13 @@
  
  CCKEXT_COMMON_FUNCTIONS := \
  	absvdi2 \
---- tools/clang/runtime/compiler-rt/Makefile.orig	2012-09-09 12:41:38.000000000 -0700
-+++ tools/clang/runtime/compiler-rt/Makefile	2012-09-09 12:42:04.000000000 -0700
-@@ -75,7 +75,7 @@ ifeq ($(OS),Darwin)
+--- a/tools/clang/runtime/compiler-rt/Makefile.orig	2012-10-12 01:42:13.000000000 -0700
++++ b/tools/clang/runtime/compiler-rt/Makefile	2012-10-12 09:24:08.000000000 -0700
+@@ -75,7 +75,6 @@ ifeq ($(OS),Darwin)
  RuntimeDirs += darwin
  RuntimeLibrary.darwin.Configs := \
- 	eprintf 10.4 osx cc_kext \
--	asan_osx profile_osx
-+	profile_osx
+ 	eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
+-	asan_osx.a asan_osx_dynamic.dylib \
+ 	profile_osx.a profile_ios.a
  endif
  
- # On Linux, include a library which has all the runtime functions.
-

Modified: trunk/dports/lang/llvm-3.2/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/llvm-3.2/files/tiger-shlib.patch	2012-10-13 19:05:39 UTC (rev 98720)
+++ trunk/dports/lang/llvm-3.2/files/tiger-shlib.patch	2012-10-13 19:05:58 UTC (rev 98721)
@@ -1,6 +1,6 @@
-diff -Naurp llvm-3.0.src.orig/runtime/libprofile/Makefile llvm-3.0.src/runtime/libprofile/Makefile
---- llvm-3.0.src.orig/runtime/libprofile/Makefile	2011-07-19 16:33:42.000000000 -0700
-+++ llvm-3.0.src/runtime/libprofile/Makefile	2012-04-20 10:01:33.000000000 -0700
+diff -Naurp trunk.orig/runtime/libprofile/Makefile trunk/runtime/libprofile/Makefile
+--- trunk.orig/runtime/libprofile/Makefile	2012-10-12 00:37:16.000000000 -0700
++++ trunk/runtime/libprofile/Makefile	2012-10-12 00:40:45.000000000 -0700
 @@ -40,10 +40,12 @@ ifeq ($(HOST_OS),Darwin)
                           -Wl,-dead_strip \
                           -Wl,-seg1addr -Wl,0xE0000000 
@@ -14,12 +14,12 @@
 +                            -Wl,-dylib_install_name \
 +                            -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
 +    else
-        LLVMLibsOptions    := $(LLVMLibsOptions)  \
+        LLVMLibsOptions    := $(LLVMLibsOptions) \
                              -Wl,-install_name \
                              -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-diff -Naurp llvm-3.0.src.orig/tools/llvm-shlib/Makefile llvm-3.0.src/tools/llvm-shlib/Makefile
---- llvm-3.0.src.orig/tools/llvm-shlib/Makefile	2011-10-03 17:30:34.000000000 -0700
-+++ llvm-3.0.src/tools/llvm-shlib/Makefile	2012-04-20 10:03:56.000000000 -0700
+diff -Naurp trunk.orig/tools/llvm-shlib/Makefile trunk/tools/llvm-shlib/Makefile
+--- trunk.orig/tools/llvm-shlib/Makefile	2012-10-12 00:37:16.000000000 -0700
++++ trunk/tools/llvm-shlib/Makefile	2012-10-12 00:39:43.000000000 -0700
 @@ -54,9 +54,12 @@ ifeq ($(HOST_OS),Darwin)
                           -Wl,-dead_strip \
                           -Wl,-seg1addr -Wl,0xE0000000 
@@ -35,10 +35,10 @@
         LLVMLibsOptions    := $(LLVMLibsOptions)  \
                              -Wl,-install_name \
                              -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-diff -Naurp llvm-3.0.src.orig/tools/lto/Makefile llvm-3.0.src/tools/lto/Makefile
---- llvm-3.0.src.orig/tools/lto/Makefile	2011-03-28 17:01:39.000000000 -0700
-+++ llvm-3.0.src/tools/lto/Makefile	2012-04-20 10:04:25.000000000 -0700
-@@ -49,9 +49,12 @@ ifeq ($(HOST_OS),Darwin)
+diff -Naurp trunk.orig/tools/lto/Makefile trunk/tools/lto/Makefile
+--- trunk.orig/tools/lto/Makefile	2012-10-12 00:37:16.000000000 -0700
++++ trunk/tools/lto/Makefile	2012-10-12 00:39:43.000000000 -0700
+@@ -42,9 +42,12 @@ ifeq ($(HOST_OS),Darwin)
                           -Wl,-dead_strip \
                           -Wl,-seg1addr -Wl,0xE0000000 
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121013/4d6f56e9/attachment.html>

More information about the macports-changes mailing list