[118110] trunk/dports/lang/llvm-3.5

22 Mar 2014

Revision: 118110
          https://trac.macports.org/changeset/118110
Author:   jeremyhu@macports.org
Date:     2014-03-22 16:56:03 -0700 (Sat, 22 Mar 2014)
Log Message:
-----------
{clang,llvm}-3.5: Bump to r204534

Revision Links:
--------------
    https://trac.macports.org/changeset/204534

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

Removed Paths:
-------------
    trunk/dports/lang/llvm-3.5/files/tiger-shlib-clang.patch
    trunk/dports/lang/llvm-3.5/files/tiger-shlib.patch

Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================

--- trunk/dports/lang/llvm-3.5/Portfile	2014-03-22 21:17:37 UTC (rev 118109)
+++ trunk/dports/lang/llvm-3.5/Portfile	2014-03-22 23:56:03 UTC (rev 118110)
@@ -52,7 +52,7 @@
 }
 
 fetch.type              svn
-svn.revision            202097
+svn.revision            204534
 
 set compiler_rt_rev     ${svn.revision}
 set libcxx_rev          ${svn.revision}
@@ -81,13 +81,12 @@
     }
 }
 
-patchfiles      install_target.patch \
-                tiger-shlib.patch
+patchfiles      install_target.patch
 
 patch.pre_args  -p1
 
 if {${subport} == "clang-${llvm_version}"} {
-    patchfiles-append    tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
+    patchfiles-append    tiger-libclang.patch scan-build-PR-35006.patch \
                          0001-Comment-out-SL-cctools-workaround.patch
 
     build.target        clang-only
@@ -289,7 +288,7 @@
 
         if {${os.major} > 9} {
             # http://trac.macports.org/ticket/38527
-            system "install_name_tool -id ${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib ${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib"
+            system "install_name_tool -id ${sub_prefix}/lib/clang/${llvm_version}.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib ${destroot}${sub_prefix}/lib/clang/${llvm_version}.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib"
         }
     }
 }

Deleted: trunk/dports/lang/llvm-3.5/files/tiger-shlib-clang.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/tiger-shlib-clang.patch	2014-03-22 21:17:37 UTC (rev 118109)
+++ trunk/dports/lang/llvm-3.5/files/tiger-shlib-clang.patch	2014-03-22 23:56:03 UTC (rev 118110)
@@ -1,16 +0,0 @@
---- llvm-3.0.src.orig/tools/clang/tools/libclang/Makefile	2011-07-09 14:35:58.000000000 -0700
-+++ llvm-3.0.src/tools/clang/tools/libclang/Makefile	2012-04-20 10:09:40.000000000 -0700
-@@ -38,9 +38,11 @@ ifeq ($(HOST_OS),Darwin)
-     # Extra options to override libtool defaults.
-     LLVMLibsOptions += -Wl,-dead_strip -Wl,-seg1addr,0xE0000000 
- 
--    # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
-     DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
--    ifneq ($(DARWIN_VERS),8)
-+    ifeq ($(DARWIN_VERS),8)
-+       LLVMLibsOptions += -Wl,-install_name \
-+                          -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-+    else
-        LLVMLibsOptions += -Wl,-install_name \
-                           -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
-     endif

Deleted: trunk/dports/lang/llvm-3.5/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/tiger-shlib.patch	2014-03-22 21:17:37 UTC (rev 118109)
+++ trunk/dports/lang/llvm-3.5/files/tiger-shlib.patch	2014-03-22 23:56:03 UTC (rev 118110)
@@ -1,36 +0,0 @@
-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 
- 
--    # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
-     DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
--    ifneq ($(DARWIN_VERS),8)
-+    ifeq ($(DARWIN_VERS),8)
-+       LLVMLibsOptions    := $(LLVMLibsOptions)  \
-+                            -Wl,-dylib_install_name \
-+                            -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-+    else
-        LLVMLibsOptions    := $(LLVMLibsOptions)  \
-                             -Wl,-install_name \
-                             -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-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 
- 
--    # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
-     DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
--    ifneq ($(DARWIN_VERS),8)
-+    ifeq ($(DARWIN_VERS),8)
-+       LLVMLibsOptions    := $(LLVMLibsOptions)  \
-+                            -Wl,-dylib_install_name \
-+                            -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-+    else
-        LLVMLibsOptions    := $(LLVMLibsOptions)  \
-                             -Wl,-install_name \
-                             -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"

    

jeremyhu＠macports.org

tags

participants (1)