[91487] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Mon Apr 2 20:03:00 PDT 2012
Revision: 91487
https://trac.macports.org/changeset/91487
Author: jeremyhu at macports.org
Date: 2012-04-02 20:02:59 -0700 (Mon, 02 Apr 2012)
Log Message:
-----------
{clang,llvm}-*: Even more Tiger goodness
Now that MacPorts' ld64 can -install_name_tool and apple-gcc42 uses it, we
can link libLLVM consistently like newer OS versions.
Modified Paths:
--------------
trunk/dports/lang/clang-2.9/Portfile
trunk/dports/lang/clang-2.9/files/install_target.patch
trunk/dports/lang/clang-3.0/Portfile
trunk/dports/lang/clang-3.0/files/install_target.patch
trunk/dports/lang/clang-3.1/Portfile
trunk/dports/lang/clang-3.1/files/install_target.patch
trunk/dports/lang/llvm-2.9/Portfile
trunk/dports/lang/llvm-3.0/Portfile
trunk/dports/lang/llvm-3.1/Portfile
Added Paths:
-----------
trunk/dports/lang/clang-2.9/files/tiger-shlib.patch
trunk/dports/lang/clang-3.0/files/tiger-shlib.patch
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
Modified: trunk/dports/lang/clang-2.9/Portfile
===================================================================
--- trunk/dports/lang/clang-2.9/Portfile 2012-04-03 00:48:44 UTC (rev 91486)
+++ trunk/dports/lang/clang-2.9/Portfile 2012-04-03 03:02:59 UTC (rev 91487)
@@ -56,7 +56,9 @@
rmd160 4ab79cbd0e2ad25a2272e6ee2fbbf546818dbd73 \
sha256 70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df
-patchfiles install_target.patch
+patchfiles install_target.patch \
+ tiger-shlib.patch
+patch.pre_args -p1
build.target clang-only
destroot.target install-clang
Modified: trunk/dports/lang/clang-2.9/files/install_target.patch
===================================================================
--- trunk/dports/lang/clang-2.9/files/install_target.patch 2012-04-03 00:48:44 UTC (rev 91486)
+++ trunk/dports/lang/clang-2.9/files/install_target.patch 2012-04-03 03:02:59 UTC (rev 91487)
@@ -1,5 +1,5 @@
---- Makefile.orig 2012-01-22 19:39:46.000000000 -0800
-+++ Makefile 2012-01-22 19:40:29.000000000 -0800
+--- a/Makefile.orig 2012-01-22 19:39:46.000000000 -0800
++++ b/Makefile 2012-01-22 19:40:29.000000000 -0800
@@ -68,8 +68,9 @@ endif
ifeq ($(MAKECMDGOALS),install-clang)
Added: trunk/dports/lang/clang-2.9/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/clang-2.9/files/tiger-shlib.patch (rev 0)
+++ trunk/dports/lang/clang-2.9/files/tiger-shlib.patch 2012-04-03 03:02:59 UTC (rev 91487)
@@ -0,0 +1,19 @@
+--- 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)
+ -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 ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
Modified: trunk/dports/lang/clang-3.0/Portfile
===================================================================
--- trunk/dports/lang/clang-3.0/Portfile 2012-04-03 00:48:44 UTC (rev 91486)
+++ trunk/dports/lang/clang-3.0/Portfile 2012-04-03 03:02:59 UTC (rev 91487)
@@ -56,7 +56,9 @@
rmd160 640b309116db4357627c0b81ebba5dab824d9eeb \
sha256 b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d
-patchfiles install_target.patch
+patchfiles install_target.patch \
+ tiger-shlib.patch
+patch.pre_args -p1
build.target clang-only
destroot.target install-clang
Modified: trunk/dports/lang/clang-3.0/files/install_target.patch
===================================================================
--- trunk/dports/lang/clang-3.0/files/install_target.patch 2012-04-03 00:48:44 UTC (rev 91486)
+++ trunk/dports/lang/clang-3.0/files/install_target.patch 2012-04-03 03:02:59 UTC (rev 91487)
@@ -1,5 +1,5 @@
---- Makefile.orig 2011-10-07 17:27:38.000000000 -0700
-+++ Makefile 2012-01-22 19:44:34.000000000 -0800
+--- a/Makefile.orig 2011-10-07 17:27:38.000000000 -0700
++++ b/Makefile 2012-01-22 19:44:34.000000000 -0800
@@ -68,8 +68,9 @@ endif
ifeq ($(MAKECMDGOALS),install-clang)
Added: trunk/dports/lang/clang-3.0/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/clang-3.0/files/tiger-shlib.patch (rev 0)
+++ trunk/dports/lang/clang-3.0/files/tiger-shlib.patch 2012-04-03 03:02:59 UTC (rev 91487)
@@ -0,0 +1,19 @@
+--- 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)
+ -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 ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
Modified: trunk/dports/lang/clang-3.1/Portfile
===================================================================
--- trunk/dports/lang/clang-3.1/Portfile 2012-04-03 00:48:44 UTC (rev 91486)
+++ trunk/dports/lang/clang-3.1/Portfile 2012-04-03 03:02:59 UTC (rev 91487)
@@ -48,7 +48,10 @@
#distfiles llvm-${version}${extract.suffix} clang-${version}${extract.suffix}
#worksrcdir llvm-${version}.src
-patchfiles install_target.patch
+patchfiles install_target.patch \
+ tiger.patch \
+ tiger-shlib.patch
+patch.pre_args -p1
build.target clang-only
destroot.target install-clang
@@ -65,9 +68,6 @@
select.group clang
select.file ${filespath}/mp-${name}
-patchfiles tiger.patch
-patch.pre_args -p1
-
# g++-4.0 fails to build some of the newer C++ for ppc
# Intel looks ok, but I prefer using gcc-4.2 for consistency
if {${configure.compiler} == "gcc-4.0"} {
Modified: trunk/dports/lang/clang-3.1/files/install_target.patch
===================================================================
--- trunk/dports/lang/clang-3.1/files/install_target.patch 2012-04-03 00:48:44 UTC (rev 91486)
+++ trunk/dports/lang/clang-3.1/files/install_target.patch 2012-04-03 03:02:59 UTC (rev 91487)
@@ -1,5 +1,5 @@
---- Makefile.orig 2012-01-22 17:34:02.000000000 -0800
-+++ Makefile 2012-01-22 17:34:14.000000000 -0800
+--- a/Makefile.orig 2012-01-22 17:34:02.000000000 -0800
++++ b/Makefile 2012-01-22 17:34:14.000000000 -0800
@@ -70,8 +70,7 @@ ifeq ($(MAKECMDGOALS),install-clang)
DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
tools/clang/tools/libclang tools/clang/tools/c-index-test \
Added: trunk/dports/lang/clang-3.1/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/clang-3.1/files/tiger-shlib.patch (rev 0)
+++ trunk/dports/lang/clang-3.1/files/tiger-shlib.patch 2012-04-03 03:02:59 UTC (rev 91487)
@@ -0,0 +1,19 @@
+--- 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)
+ -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 ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
Modified: trunk/dports/lang/llvm-2.9/Portfile
===================================================================
--- trunk/dports/lang/llvm-2.9/Portfile 2012-04-03 00:48:44 UTC (rev 91486)
+++ trunk/dports/lang/llvm-2.9/Portfile 2012-04-03 03:02:59 UTC (rev 91487)
@@ -43,6 +43,9 @@
rmd160 caeaa067fda1eb34196b356a087645f83731cfb7 \
sha256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
+patchfiles tiger-shlib.patch
+patch.pre_args -p1
+
build.env-append VERBOSE=1 REQUIRE_RTTI=1
destroot.env-append VERBOSE=1 REQUIRE_RTTI=1
configure.cppflags
Added: trunk/dports/lang/llvm-2.9/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/llvm-2.9/files/tiger-shlib.patch (rev 0)
+++ trunk/dports/lang/llvm-2.9/files/tiger-shlib.patch 2012-04-03 03:02:59 UTC (rev 91487)
@@ -0,0 +1,19 @@
+--- 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)
+ -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 ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
Modified: trunk/dports/lang/llvm-3.0/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.0/Portfile 2012-04-03 00:48:44 UTC (rev 91486)
+++ trunk/dports/lang/llvm-3.0/Portfile 2012-04-03 03:02:59 UTC (rev 91487)
@@ -43,6 +43,9 @@
rmd160 85211cafbed1c5d838ac54669017b5298613f975 \
sha256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477
+patchfiles tiger-shlib.patch
+patch.pre_args -p1
+
build.env-append VERBOSE=1 REQUIRE_RTTI=1
destroot.env-append VERBOSE=1 REQUIRE_RTTI=1
configure.cppflags
Added: trunk/dports/lang/llvm-3.0/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/llvm-3.0/files/tiger-shlib.patch (rev 0)
+++ trunk/dports/lang/llvm-3.0/files/tiger-shlib.patch 2012-04-03 03:02:59 UTC (rev 91487)
@@ -0,0 +1,19 @@
+--- 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)
+ -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 ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
Modified: trunk/dports/lang/llvm-3.1/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.1/Portfile 2012-04-03 00:48:44 UTC (rev 91486)
+++ trunk/dports/lang/llvm-3.1/Portfile 2012-04-03 03:02:59 UTC (rev 91487)
@@ -39,6 +39,10 @@
#distfiles llvm-${version}${extract.suffix}
#worksrcdir llvm-${version}.src
+patchfiles tiger.patch \
+ tiger-shlib.patch
+patch.pre_args -p1
+
build.env-append VERBOSE=1 REQUIRE_RTTI=1
destroot.env-append VERBOSE=1 REQUIRE_RTTI=1
configure.cppflags
@@ -52,9 +56,6 @@
select.group llvm
select.file ${filespath}/mp-${name}
-patchfiles tiger.patch
-patch.pre_args -p1
-
# g++-4.0 fails to build some of the newer C++ for ppc
# Intel looks ok, but I prefer using gcc-4.2 for consistency
if {${configure.compiler} == "gcc-4.0"} {
Added: trunk/dports/lang/llvm-3.1/files/tiger-shlib.patch
===================================================================
--- trunk/dports/lang/llvm-3.1/files/tiger-shlib.patch (rev 0)
+++ trunk/dports/lang/llvm-3.1/files/tiger-shlib.patch 2012-04-03 03:02:59 UTC (rev 91487)
@@ -0,0 +1,19 @@
+--- 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)
+ -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 ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120402/d9c840f5/attachment.html>
More information about the macports-changes
mailing list