[131782] trunk/dports/lang/llvm-3.4
jeremyhu at macports.org
jeremyhu at macports.org
Sun Jan 18 02:07:16 PST 2015
Revision: 131782
https://trac.macports.org/changeset/131782
Author: jeremyhu at macports.org
Date: 2015-01-18 02:07:16 -0800 (Sun, 18 Jan 2015)
Log Message:
-----------
llvm-3.4: Fix some build issues on Tiger (#39849)
Modified Paths:
--------------
trunk/dports/lang/llvm-3.4/Portfile
trunk/dports/lang/llvm-3.4/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
trunk/dports/lang/llvm-3.4/files/0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch
trunk/dports/lang/llvm-3.4/files/0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch
trunk/dports/lang/llvm-3.4/files/0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
trunk/dports/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
trunk/dports/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
trunk/dports/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch
trunk/dports/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch
trunk/dports/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
Added Paths:
-----------
trunk/dports/lang/llvm-3.4/files/0005-_CS_DARWIN_USER-macros-available-on-darwin-9.-Thanks.patch
trunk/dports/lang/llvm-3.4/files/0006-Fix-dylib-install-name-when-building-on-Tiger.patch
trunk/dports/lang/llvm-3.4/files/1010-Fix-dylib-install-name-when-building-on-Tiger.patch
Removed Paths:
-------------
trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch
trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch
Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/Portfile 2015-01-18 10:07:16 UTC (rev 131782)
@@ -112,7 +112,8 @@
0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch \
0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch \
0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \
- fix-dylib-ids.patch
+ 0005-_CS_DARWIN_USER-macros-available-on-darwin-9.-Thanks.patch \
+ 0006-Fix-dylib-install-name-when-building-on-Tiger.patch
if {${subport} eq "clang-${llvm_version}"} {
patchfiles-append \
@@ -120,10 +121,12 @@
1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch \
1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
+ 1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch \
1006-Default-to-ppc7400-for-OSX-10.5.patch \
1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch \
1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch \
1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
+ 1010-Fix-dylib-install-name-when-building-on-Tiger.patch \
2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
2002-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch \
3001-buildit-build-fix-for-Leopard.patch \
@@ -131,8 +134,7 @@
3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
3004-Fix-missing-long-long-math-prototypes-when-using-the.patch \
3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
- compiler_rt-toolchain.patch \
- fix-clang-dylib-ids.patch
+ compiler_rt-toolchain.patch
# I'm not sure if we need to delete this. It seems to build fine with it
# present, but we used to explicitly only use this patch for the llvm subport.
Modified: trunk/dports/lang/llvm-3.4/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From 8462fd916cfd76a4871e67cac0527d67bd65b5f6 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 16:33:09 -0800
-Subject: [PATCH 1/4] MacPorts Only: Update install targets for clang subport
+Subject: [PATCH 1/6] MacPorts Only: Update install targets for clang subport
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
(cherry picked from commit b514fa09a560de0b3241c6af0d134bae09a6aec3)
Modified: trunk/dports/lang/llvm-3.4/files/0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From dc6e6e5c54168582a1127126797ae34cd8668b5b Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 16:43:00 -0800
-Subject: [PATCH 2/4] MacPorts Only: Skip checking for python in configure
+Subject: [PATCH 2/6] MacPorts Only: Skip checking for python in configure
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
(cherry picked from commit cf8cce2b5201c8113a73bb2c0c5e5f6a2d9085b8)
Modified: trunk/dports/lang/llvm-3.4/files/0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From f44378e03d9806b0b528b8589a4c705a9c564889 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 18:52:14 -0800
-Subject: [PATCH 3/4] MacPorts Only: Fix sample project regex to work with
+Subject: [PATCH 3/6] MacPorts Only: Fix sample project regex to work with
multiple digit versions
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Modified: trunk/dports/lang/llvm-3.4/files/0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From 93300e85de8ff472bd8bfba2850ad9111eb0c080 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 09:03:43 -0800
-Subject: [PATCH 4/4] Set the Mach-O CPU Subtype to ppc7400 when targeting
+Subject: [PATCH 4/6] Set the Mach-O CPU Subtype to ppc7400 when targeting
Leopard
http://llvm.org/bugs/show_bug.cgi?id=18463
Added: trunk/dports/lang/llvm-3.4/files/0005-_CS_DARWIN_USER-macros-available-on-darwin-9.-Thanks.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0005-_CS_DARWIN_USER-macros-available-on-darwin-9.-Thanks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/0005-_CS_DARWIN_USER-macros-available-on-darwin-9.-Thanks.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -0,0 +1,30 @@
+From 05ff848a0f4643678c5cfa3e56cdacbd40baa15a Mon Sep 17 00:00:00 2001
+From: David Fang <fang at csl.cornell.edu>
+Date: Wed, 12 Feb 2014 21:02:12 +0000
+Subject: [PATCH 5/6] _CS_DARWIN_USER macros available on darwin>=9. Thanks,
+ Dave Odell!
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201255 91177308-0d34-0410-b5e6-96231b3b80d8
+(cherry picked from commit 17159cb1588dd44d0cfc8a5f96da8be04be4c975)
+---
+ lib/Support/Path.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git llvm_release_34/lib/Support/Path.cpp macports_release_34/lib/Support/Path.cpp
+index c869b30..259fcad 100644
+--- llvm_release_34/lib/Support/Path.cpp
++++ macports_release_34/lib/Support/Path.cpp
+@@ -507,8 +507,9 @@ bool is_separator(char value) {
+ void system_temp_directory(bool erasedOnReboot, SmallVectorImpl<char> &result) {
+ result.clear();
+
+-#ifdef __APPLE__
++#if defined(_CS_DARWIN_USER_TEMP_DIR) && defined(_CS_DARWIN_USER_CACHE_DIR)
+ // On Darwin, use DARWIN_USER_TEMP_DIR or DARWIN_USER_CACHE_DIR.
++ // macros defined in <unistd.h> on darwin >= 9
+ int ConfName = erasedOnReboot? _CS_DARWIN_USER_TEMP_DIR
+ : _CS_DARWIN_USER_CACHE_DIR;
+ size_t ConfLen = confstr(ConfName, 0, 0);
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/0006-Fix-dylib-install-name-when-building-on-Tiger.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0006-Fix-dylib-install-name-when-building-on-Tiger.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/0006-Fix-dylib-install-name-when-building-on-Tiger.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -0,0 +1,77 @@
+From 0e2fd2e555599cc88b757a40ea69ab2d70bc1811 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sun, 18 Jan 2015 02:03:41 -0800
+Subject: [PATCH 6/6] Fix dylib install name when building on Tiger
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Makefile.rules | 11 +++++++++++
+ tools/llvm-shlib/Makefile | 9 ++-------
+ tools/lto/Makefile | 9 ++-------
+ 3 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git llvm_release_34/Makefile.rules macports_release_34/Makefile.rules
+index fde77f9..3a9b81f 100644
+--- llvm_release_34/Makefile.rules
++++ macports_release_34/Makefile.rules
+@@ -581,6 +581,17 @@ ifdef SHARED_LIBRARY
+ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+ ifneq ($(HOST_OS),Darwin)
+ LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
++else
++ ifeq ($(DARWIN_MAJVERS),4)
++ LD.Flags += -Wl,-dylib_install_name
++ else
++ LD.Flags += -Wl,-install_name
++ endif
++ ifdef LOADABLE_MODULE
++ LD.Flags += -Wl,"$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)"
++ else
++ LD.Flags += -Wl,"$(PROJ_libdir)/$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)"
++ endif
+ endif
+ endif
+ endif
+diff --git llvm_release_34/tools/llvm-shlib/Makefile macports_release_34/tools/llvm-shlib/Makefile
+index b912ea6..fe24c4b 100644
+--- llvm_release_34/tools/llvm-shlib/Makefile
++++ macports_release_34/tools/llvm-shlib/Makefile
+@@ -55,13 +55,8 @@ ifeq ($(HOST_OS),Darwin)
+ LLVMLibsOptions := $(LLVMLibsOptions) \
+ -Wl,-dead_strip
+
+- # 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,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
+- endif
++ # $(LEVEL)/Makefile.rules has been patched to set the install name
++ # for all dylibs.
+ endif
+
+ ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD OpenBSD GNU Bitrig))
+diff --git llvm_release_34/tools/lto/Makefile macports_release_34/tools/lto/Makefile
+index cedbee1..40c80f5 100644
+--- llvm_release_34/tools/lto/Makefile
++++ macports_release_34/tools/lto/Makefile
+@@ -41,13 +41,8 @@ ifeq ($(HOST_OS),Darwin)
+ LLVMLibsOptions := $(LLVMLibsOptions) \
+ -Wl,-dead_strip
+
+- # 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
++ # $(LEVEL)/Makefile.rules has been patched to set the install name
++ # for all dylibs.
+
+ # If we're doing an Apple-style build, add the LTO object path.
+ ifeq ($(RC_XBS),YES)
+--
+2.2.2
+
Modified: trunk/dports/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From 47d961284ee5012426d7ed9aa694c5092ec77d09 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
-Subject: [PATCH 1001/1009] MacPorts Only: Prepare clang-format for replacement
+Subject: [PATCH 1001/1010] MacPorts Only: Prepare clang-format for replacement
with absolute path
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Modified: trunk/dports/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From b63ecbd1b0a7b65e736bcd3be08cd6935ec2b49e Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
-Subject: [PATCH 1002/1009] MacPorts Only: Fix name of scan-view executable
+Subject: [PATCH 1002/1010] MacPorts Only: Fix name of scan-view executable
inside scan-build
http://trac.macports.org/ticket/35006
Modified: trunk/dports/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From cc0e2a7b162eea6f7918dd29cfbbcd96aaa59a09 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 17:56:44 -0800
-Subject: [PATCH 1003/1009] MacPorts Only: Fix libclang_rt dylib ids
+Subject: [PATCH 1003/1010] MacPorts Only: Fix libclang_rt dylib ids
We should probably not be shipping these.
Modified: trunk/dports/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From 6c249a820605f4e2f998d5849b5be1005bf480e3 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 17:58:25 -0800
-Subject: [PATCH 1004/1009] MacPorts Only: Relocate clang resources using llvm
+Subject: [PATCH 1004/1010] MacPorts Only: Relocate clang resources using llvm
version
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Modified: trunk/dports/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From e149c95a9e4135360256d4037c6a9718e6c03f97 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola at gmail.com>
Date: Thu, 28 Aug 2014 21:23:05 +0000
-Subject: [PATCH 1005/1009] Call powerpc-darwin external tools with -arch ppc.
+Subject: [PATCH 1005/1010] Call powerpc-darwin external tools with -arch ppc.
With this patch we call external tools for powerpc-darwin with "-arch ppc"
instead of "-arch powerpc", so as to be compatible with the cctools assembler
Modified: trunk/dports/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From 0a8c33e1e541afd67d1e73dbb5c3dce7642ce9c2 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain at codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
-Subject: [PATCH 1006/1009] Default to ppc7400 for OSX 10.5+
+Subject: [PATCH 1006/1010] Default to ppc7400 for OSX 10.5+
(cherry picked from commit 971aa68baad8c240f1abf30e62bd947a8923e3fa)
---
Modified: trunk/dports/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From f19c8901645037dcf8fb45a3d3ae25653a40df78 Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian at apple.com>
Date: Mon, 20 Jan 2014 19:32:33 +0000
-Subject: [PATCH 1007/1009] reinstate -fno-objc-legacy-dispatch behavior when
+Subject: [PATCH 1007/1010] reinstate -fno-objc-legacy-dispatch behavior when
the deployment target is 10.5 or earlier
<rdar://problem/18971940>
Modified: trunk/dports/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From ab94d8e941daedf76ac64fdbd48f55e7f76f8fcd Mon Sep 17 00:00:00 2001
From: Bob Wilson <bob.wilson at apple.com>
Date: Fri, 8 Aug 2014 21:45:53 +0000
-Subject: [PATCH 1008/1009] Change
+Subject: [PATCH 1008/1010] Change
__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ for versions > 10.9.
The previous encoding only allowed a single digit for the minor version
Modified: trunk/dports/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,7 +1,7 @@
From a77967e715ba05ad0b295efeb4b81554a4f978e7 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 19:08:57 -0800
-Subject: [PATCH 1009/1009] Only call setpriority(PRIO_DARWIN_THREAD, 0,
+Subject: [PATCH 1009/1010] Only call setpriority(PRIO_DARWIN_THREAD, 0,
PRIO_DARWIN_BG) if it is available
Tiger and earlier versions of darwin do not support this.
Added: trunk/dports/lang/llvm-3.4/files/1010-Fix-dylib-install-name-when-building-on-Tiger.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1010-Fix-dylib-install-name-when-building-on-Tiger.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/1010-Fix-dylib-install-name-when-building-on-Tiger.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -0,0 +1,32 @@
+From f87a09a7b12c8c6eeaf74df7ecefd9d6c81763cf Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sun, 18 Jan 2015 02:04:36 -0800
+Subject: [PATCH 1010/1010] Fix dylib install name when building on Tiger
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ tools/libclang/Makefile | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git llvm_release_34/tools/clang/tools/libclang/Makefile macports_release_34/tools/clang/tools/libclang/Makefile
+index 43ecbd1..971cc43 100644
+--- llvm_release_34/tools/clang/tools/libclang/Makefile
++++ macports_release_34/tools/clang/tools/libclang/Makefile
+@@ -49,12 +49,8 @@ ifeq ($(HOST_OS),Darwin)
+ # Extra options to override libtool defaults.
+ LLVMLibsOptions += -Wl,-dead_strip
+
+- # 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 += -Wl,-install_name \
+- -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
+- endif
++ # $(CLANG_LEVEL)/../../Makefile.rules has been patched to set the
++ # install name for all dylibs.
+
+ # If we're doing an Apple-style build, add the LTO object path.
+ ifeq ($(RC_XBS),YES)
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,19 +0,0 @@
-Index: llvm-3.4.2.src/tools/clang/tools/libclang/Makefile
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/tools/libclang/Makefile
-+++ llvm-3.4.2.src/tools/clang/tools/libclang/Makefile
-@@ -49,12 +49,8 @@ ifeq ($(HOST_OS),Darwin)
- # Extra options to override libtool defaults.
- LLVMLibsOptions += -Wl,-dead_strip
-
-- # 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 += -Wl,-install_name \
-- -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
-- endif
-+ # $(CLANG_LEVEL)/../../Makefile.rules has been patched to set the
-+ # install name for all dylibs.
-
- # If we're doing an Apple-style build, add the LTO object path.
- ifeq ($(RC_XBS),YES)
Deleted: trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch 2015-01-18 09:49:39 UTC (rev 131781)
+++ trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch 2015-01-18 10:07:16 UTC (rev 131782)
@@ -1,62 +0,0 @@
-Index: llvm-3.4.2.src/tools/llvm-shlib/Makefile
-===================================================================
---- llvm-3.4.2.src.orig/tools/llvm-shlib/Makefile
-+++ llvm-3.4.2.src/tools/llvm-shlib/Makefile
-@@ -55,13 +55,8 @@ ifeq ($(HOST_OS),Darwin)
- LLVMLibsOptions := $(LLVMLibsOptions) \
- -Wl,-dead_strip
-
-- # 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,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
-- endif
-+ # $(LEVEL)/Makefile.rules has been patched to set the install name
-+ # for all dylibs.
- endif
-
- ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD OpenBSD GNU Bitrig))
-Index: llvm-3.4.2.src/tools/lto/Makefile
-===================================================================
---- llvm-3.4.2.src.orig/tools/lto/Makefile
-+++ llvm-3.4.2.src/tools/lto/Makefile
-@@ -41,13 +41,8 @@ ifeq ($(HOST_OS),Darwin)
- LLVMLibsOptions := $(LLVMLibsOptions) \
- -Wl,-dead_strip
-
-- # 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
-+ # $(LEVEL)/Makefile.rules has been patched to set the install name
-+ # for all dylibs.
-
- # If we're doing an Apple-style build, add the LTO object path.
- ifeq ($(RC_XBS),YES)
-Index: llvm-3.4.2.src/Makefile.rules
-===================================================================
---- llvm-3.4.2.src.orig/Makefile.rules
-+++ llvm-3.4.2.src/Makefile.rules
-@@ -581,6 +581,17 @@ ifdef SHARED_LIBRARY
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
- ifneq ($(HOST_OS),Darwin)
- LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
-+else
-+ ifeq ($(DARWIN_MAJVERS),4)
-+ LD.Flags += -Wl,-dylib_install_name
-+ else
-+ LD.Flags += -Wl,-install_name
-+ endif
-+ ifdef LOADABLE_MODULE
-+ LD.Flags += -Wl,"$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)"
-+ else
-+ LD.Flags += -Wl,"$(PROJ_libdir)/$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)"
-+ endif
- endif
- endif
- endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150118/63c51e9e/attachment-0001.html>
More information about the macports-changes
mailing list