Changeset 98721

Timestamp:

Oct 13, 2012, 7:05:58 PM (12 years ago)

Author:

jeremyhu@…

Message:

llvm-3.2: Update to r165785

Location:

trunk/dports/lang

Files:

• dragonegg-3.2/Portfile (modified) (1 diff)
• llvm-3.2/Portfile (modified) (2 diffs)
• llvm-3.2/files/leopard-no-asan.patch (modified) (3 diffs)
• llvm-3.2/files/tiger-shlib.patch (modified) (3 diffs)

trunk/dports/lang/dragonegg-3.2/Portfile

@@ -31 +31 @@
 
 fetch.type              svn
-svn.revision            163485
+svn.revision            165785
 version                 ${llvm_version}-r${svn.revision}
 worksrcdir              trunk

trunk/dports/lang/llvm-3.2/Portfile

@@ -49 +49 @@
 
 fetch.type              svn
-svn.revision            164372
+svn.revision            165785 
 set compiler_rt_rev     ${svn.revision}
 set libcxx_rev          ${svn.revision}
@@ -195 +195 @@
             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
         }
     }

trunk/dports/lang/llvm-3.2/files/leopard-no-asan.patch

@@ -1 @@
---- 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)
@@ -38 +39 @@
  # 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
@@ -61 +62 @@
  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.
-

trunk/dports/lang/llvm-3.2/files/tiger-shlib.patch

@@ -1 @@
-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 \
@@ -15 +15 @@
 +                            -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 \
@@ -36 +36 @@
                              -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