[92171] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Fri Apr 20 18:24:33 PDT 2012
Revision: 92171
https://trac.macports.org/changeset/92171
Author: jeremyhu at macports.org
Date: 2012-04-20 18:24:33 -0700 (Fri, 20 Apr 2012)
Log Message:
-----------
{clang,llvm}-*: Update our patches for Tiger
Not bumping revision since it's not really worth it. The only real change is
that c-index-test is now linked correctly on Tiger in clang-3.0 and clang-3.1.
Modified Paths:
--------------
trunk/dports/lang/clang-2.9/Portfile
trunk/dports/lang/clang-2.9/files/tiger-shlib.patch
trunk/dports/lang/clang-3.0/Portfile
trunk/dports/lang/clang-3.0/files/tiger-shlib.patch
trunk/dports/lang/clang-3.1/Portfile
trunk/dports/lang/clang-3.1/files/tiger-shlib.patch
trunk/dports/lang/llvm-2.9/files/tiger-shlib.patch
trunk/dports/lang/llvm-3.0/files/tiger-shlib.patch
trunk/dports/lang/llvm-3.1/files/tiger-shlib.patch
Added Paths:
-----------
trunk/dports/lang/clang-2.9/files/tiger-shlib-clang.patch
trunk/dports/lang/clang-3.0/files/tiger-shlib-clang.patch
trunk/dports/lang/clang-3.1/files/tiger-shlib-clang.patch
Modified: trunk/dports/lang/clang-2.9/Portfile
===================================================================
--- trunk/dports/lang/clang-2.9/Portfile 2012-04-20 23:32:01 UTC (rev 92170)
+++ trunk/dports/lang/clang-2.9/Portfile 2012-04-21 01:24:33 UTC (rev 92171)
@@ -58,6 +58,7 @@
patchfiles install_target.patch \
tiger-shlib.patch \
+ tiger-shlib-clang.patch \
0001-Add-a-few-missing-template-keywords.patch
patch.pre_args -p1
Added: trunk/dports/lang/clang-2.9/files/tiger-shlib-clang.patch
===================================================================
--- trunk/dports/lang/clang-2.9/files/tiger-shlib-clang.patch (rev 0)
+++ trunk/dports/lang/clang-2.9/files/tiger-shlib-clang.patch 2012-04-21 01:24:33 UTC (rev 92171)
@@ -0,0 +1,16 @@
+--- 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
Modified: trunk/dports/lang/clang-2.9/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/clang-2.9/files/tiger-shlib.patch 2012-04-20 23:32:01 UTC (rev 92170)
+++ trunk/dports/lang/clang-2.9/files/tiger-shlib.patch 2012-04-21 01:24:33 UTC (rev 92171)
@@ -1,19 +1,54 @@
---- a/tools/llvm-shlib/Makefile.orig 2012-04-02 15:41:23.000000000 -0700
-+++ b/tools/llvm-shlib/Makefile 2012-04-02 15:42:09.000000000 -0700
-@@ -54,13 +54,10 @@ ifeq ($(HOST_OS),Darwin)
+diff -Naurp llvm-3.0.src.orig/tools/edis/Makefile llvm-3.0.src/tools/edis/Makefile
+--- llvm-3.0.src.orig/tools/edis/Makefile 2011-08-02 15:53:48.000000000 -0700
++++ llvm-3.0.src/tools/edis/Makefile 2012-04-20 10:06:48.000000000 -0700
+@@ -42,9 +42,12 @@ ifeq ($(HOST_OS),Darwin)
+ -Wl,-compatibility_version -Wl,1
+ endif
+
+- # 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,"@rpath/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
+@@ -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)
-- LLVMLibsOptions := $(LLVMLibsOptions) \
-- -Wl,-install_name \
-- -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-- endif
-+ LLVMLibsOptions := $(LLVMLibsOptions) \
-+ -Wl,-install_name \
-+ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
- endif
++ 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 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)
+ -Wl,-dead_strip \
+ -Wl,-seg1addr -Wl,0xE0000000
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
+- # 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)"
Modified: trunk/dports/lang/clang-3.0/Portfile
===================================================================
--- trunk/dports/lang/clang-3.0/Portfile 2012-04-20 23:32:01 UTC (rev 92170)
+++ trunk/dports/lang/clang-3.0/Portfile 2012-04-21 01:24:33 UTC (rev 92171)
@@ -58,6 +58,7 @@
patchfiles install_target.patch \
tiger-shlib.patch \
+ tiger-shlib-clang.patch \
0001-Add-a-few-missing-template-keywords.patch
patch.pre_args -p1
Added: trunk/dports/lang/clang-3.0/files/tiger-shlib-clang.patch
===================================================================
--- trunk/dports/lang/clang-3.0/files/tiger-shlib-clang.patch (rev 0)
+++ trunk/dports/lang/clang-3.0/files/tiger-shlib-clang.patch 2012-04-21 01:24:33 UTC (rev 92171)
@@ -0,0 +1,16 @@
+--- 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
Modified: trunk/dports/lang/clang-3.0/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/clang-3.0/files/tiger-shlib.patch 2012-04-20 23:32:01 UTC (rev 92170)
+++ trunk/dports/lang/clang-3.0/files/tiger-shlib.patch 2012-04-21 01:24:33 UTC (rev 92171)
@@ -1,19 +1,73 @@
---- a/tools/llvm-shlib/Makefile.orig 2012-04-02 15:41:23.000000000 -0700
-+++ b/tools/llvm-shlib/Makefile 2012-04-02 15:42:09.000000000 -0700
-@@ -54,13 +54,10 @@ ifeq ($(HOST_OS),Darwin)
+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
+@@ -40,10 +40,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 llvm-3.0.src.orig/tools/edis/Makefile llvm-3.0.src/tools/edis/Makefile
+--- llvm-3.0.src.orig/tools/edis/Makefile 2011-08-02 15:53:48.000000000 -0700
++++ llvm-3.0.src/tools/edis/Makefile 2012-04-20 10:06:48.000000000 -0700
+@@ -42,9 +42,12 @@ ifeq ($(HOST_OS),Darwin)
+ -Wl,-compatibility_version -Wl,1
+ endif
+
- # 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)
-- LLVMLibsOptions := $(LLVMLibsOptions) \
-- -Wl,-install_name \
-- -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-- endif
-+ LLVMLibsOptions := $(LLVMLibsOptions) \
-+ -Wl,-install_name \
-+ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
- endif
++ ifeq ($(DARWIN_VERS),8)
++ LLVMLibsOptions := $(LLVMLibsOptions) \
++ -Wl,-dylib_install_name \
++ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
++ else
+ LLVMLibsOptions := $(LLVMLibsOptions) \
+ -Wl,-install_name \
+ -Wl,"@rpath/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
+@@ -54,9 +54,12 @@ ifeq ($(HOST_OS),Darwin)
+ -Wl,-dead_strip \
+ -Wl,-seg1addr -Wl,0xE0000000
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
+- # 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 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)
+ -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)"
Modified: trunk/dports/lang/clang-3.1/Portfile
===================================================================
--- trunk/dports/lang/clang-3.1/Portfile 2012-04-20 23:32:01 UTC (rev 92170)
+++ trunk/dports/lang/clang-3.1/Portfile 2012-04-21 01:24:33 UTC (rev 92171)
@@ -49,7 +49,8 @@
patchfiles install_target.patch \
tiger.patch \
- tiger-shlib.patch
+ tiger-shlib.patch \
+ tiger-shlib-clang.patch
patch.pre_args -p1
build.target clang-only
Added: trunk/dports/lang/clang-3.1/files/tiger-shlib-clang.patch
===================================================================
--- trunk/dports/lang/clang-3.1/files/tiger-shlib-clang.patch (rev 0)
+++ trunk/dports/lang/clang-3.1/files/tiger-shlib-clang.patch 2012-04-21 01:24:33 UTC (rev 92171)
@@ -0,0 +1,16 @@
+--- 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
Modified: trunk/dports/lang/clang-3.1/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/clang-3.1/files/tiger-shlib.patch 2012-04-20 23:32:01 UTC (rev 92170)
+++ trunk/dports/lang/clang-3.1/files/tiger-shlib.patch 2012-04-21 01:24:33 UTC (rev 92171)
@@ -1,19 +1,55 @@
---- a/tools/llvm-shlib/Makefile.orig 2012-04-02 15:41:23.000000000 -0700
-+++ b/tools/llvm-shlib/Makefile 2012-04-02 15:42:09.000000000 -0700
-@@ -54,13 +54,10 @@ ifeq ($(HOST_OS),Darwin)
+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
+@@ -40,10 +40,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 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
+@@ -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)
-- LLVMLibsOptions := $(LLVMLibsOptions) \
-- -Wl,-install_name \
-- -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-- endif
-+ LLVMLibsOptions := $(LLVMLibsOptions) \
-+ -Wl,-install_name \
-+ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
- endif
++ 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 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)
+ -Wl,-dead_strip \
+ -Wl,-seg1addr -Wl,0xE0000000
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
+- # 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)"
Modified: trunk/dports/lang/llvm-2.9/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/llvm-2.9/files/tiger-shlib.patch 2012-04-20 23:32:01 UTC (rev 92170)
+++ trunk/dports/lang/llvm-2.9/files/tiger-shlib.patch 2012-04-21 01:24:33 UTC (rev 92171)
@@ -1,19 +1,54 @@
---- a/tools/llvm-shlib/Makefile.orig 2012-04-02 15:41:23.000000000 -0700
-+++ b/tools/llvm-shlib/Makefile 2012-04-02 15:42:09.000000000 -0700
-@@ -54,13 +54,10 @@ ifeq ($(HOST_OS),Darwin)
+diff -Naurp llvm-3.0.src.orig/tools/edis/Makefile llvm-3.0.src/tools/edis/Makefile
+--- llvm-3.0.src.orig/tools/edis/Makefile 2011-08-02 15:53:48.000000000 -0700
++++ llvm-3.0.src/tools/edis/Makefile 2012-04-20 10:06:48.000000000 -0700
+@@ -42,9 +42,12 @@ ifeq ($(HOST_OS),Darwin)
+ -Wl,-compatibility_version -Wl,1
+ endif
+
+- # 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,"@rpath/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
+@@ -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)
-- LLVMLibsOptions := $(LLVMLibsOptions) \
-- -Wl,-install_name \
-- -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-- endif
-+ LLVMLibsOptions := $(LLVMLibsOptions) \
-+ -Wl,-install_name \
-+ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
- endif
++ 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 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)
+ -Wl,-dead_strip \
+ -Wl,-seg1addr -Wl,0xE0000000
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
+- # 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)"
Modified: trunk/dports/lang/llvm-3.0/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/llvm-3.0/files/tiger-shlib.patch 2012-04-20 23:32:01 UTC (rev 92170)
+++ trunk/dports/lang/llvm-3.0/files/tiger-shlib.patch 2012-04-21 01:24:33 UTC (rev 92171)
@@ -1,19 +1,73 @@
---- a/tools/llvm-shlib/Makefile.orig 2012-04-02 15:41:23.000000000 -0700
-+++ b/tools/llvm-shlib/Makefile 2012-04-02 15:42:09.000000000 -0700
-@@ -54,13 +54,10 @@ ifeq ($(HOST_OS),Darwin)
+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
+@@ -40,10 +40,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 llvm-3.0.src.orig/tools/edis/Makefile llvm-3.0.src/tools/edis/Makefile
+--- llvm-3.0.src.orig/tools/edis/Makefile 2011-08-02 15:53:48.000000000 -0700
++++ llvm-3.0.src/tools/edis/Makefile 2012-04-20 10:06:48.000000000 -0700
+@@ -42,9 +42,12 @@ ifeq ($(HOST_OS),Darwin)
+ -Wl,-compatibility_version -Wl,1
+ endif
+
- # 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)
-- LLVMLibsOptions := $(LLVMLibsOptions) \
-- -Wl,-install_name \
-- -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-- endif
-+ LLVMLibsOptions := $(LLVMLibsOptions) \
-+ -Wl,-install_name \
-+ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
- endif
++ ifeq ($(DARWIN_VERS),8)
++ LLVMLibsOptions := $(LLVMLibsOptions) \
++ -Wl,-dylib_install_name \
++ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
++ else
+ LLVMLibsOptions := $(LLVMLibsOptions) \
+ -Wl,-install_name \
+ -Wl,"@rpath/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
+@@ -54,9 +54,12 @@ ifeq ($(HOST_OS),Darwin)
+ -Wl,-dead_strip \
+ -Wl,-seg1addr -Wl,0xE0000000
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
+- # 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 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)
+ -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)"
Modified: trunk/dports/lang/llvm-3.1/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/llvm-3.1/files/tiger-shlib.patch 2012-04-20 23:32:01 UTC (rev 92170)
+++ trunk/dports/lang/llvm-3.1/files/tiger-shlib.patch 2012-04-21 01:24:33 UTC (rev 92171)
@@ -1,19 +1,55 @@
---- a/tools/llvm-shlib/Makefile.orig 2012-04-02 15:41:23.000000000 -0700
-+++ b/tools/llvm-shlib/Makefile 2012-04-02 15:42:09.000000000 -0700
-@@ -54,13 +54,10 @@ ifeq ($(HOST_OS),Darwin)
+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
+@@ -40,10 +40,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 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
+@@ -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)
-- LLVMLibsOptions := $(LLVMLibsOptions) \
-- -Wl,-install_name \
-- -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-- endif
-+ LLVMLibsOptions := $(LLVMLibsOptions) \
-+ -Wl,-install_name \
-+ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
- endif
++ 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 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)
+ -Wl,-dead_strip \
+ -Wl,-seg1addr -Wl,0xE0000000
- ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
+- # 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)"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120420/63f3e321/attachment-0001.html>
More information about the macports-changes
mailing list