<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[131782] trunk/dports/lang/llvm-3.4</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/131782">131782</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-01-18 02:07:16 -0800 (Sun, 18 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>llvm-3.4: Fix some build issues on Tiger (#39849)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm34Portfile">trunk/dports/lang/llvm-3.4/Portfile</a></li>
<li><a href="#trunkdportslangllvm34files0001MacPortsOnlyUpdateinstalltargetsforclangsubpopatch">trunk/dports/lang/llvm-3.4/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch</a></li>
<li><a href="#trunkdportslangllvm34files0002MacPortsOnlySkipcheckingforpythoninconfigurepatch">trunk/dports/lang/llvm-3.4/files/0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch</a></li>
<li><a href="#trunkdportslangllvm34files0003MacPortsOnlyFixsampleprojectregextoworkwithpatch">trunk/dports/lang/llvm-3.4/files/0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch</a></li>
<li><a href="#trunkdportslangllvm34files0004SettheMachOCPUSubtypetoppc7400whentargetingpatch">trunk/dports/lang/llvm-3.4/files/0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch</a></li>
<li><a href="#trunkdportslangllvm34files1001MacPortsOnlyPrepareclangformatforreplacementwpatch">trunk/dports/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch</a></li>
<li><a href="#trunkdportslangllvm34files1002MacPortsOnlyFixnameofscanviewexecutableinsidpatch">trunk/dports/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch</a></li>
<li><a href="#trunkdportslangllvm34files1003MacPortsOnlyFixlibclang_rtdylibidspatch">trunk/dports/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch</a></li>
<li><a href="#trunkdportslangllvm34files1004MacPortsOnlyRelocateclangresourcesusingllvmvepatch">trunk/dports/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch</a></li>
<li><a href="#trunkdportslangllvm34files1005Callpowerpcdarwinexternaltoolswitharchppcpatch">trunk/dports/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch</a></li>
<li><a href="#trunkdportslangllvm34files1006Defaulttoppc7400forOSX105patch">trunk/dports/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch</a></li>
<li><a href="#trunkdportslangllvm34files1007reinstatefnoobjclegacydispatchbehaviorwhenthepatch">trunk/dports/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch</a></li>
<li><a href="#trunkdportslangllvm34files1008Change__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</a></li>
<li><a href="#trunkdportslangllvm34files1009OnlycallsetpriorityPRIO_DARWIN_THREAD0PRIO_DARWpatch">trunk/dports/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm34files0005_CS_DARWIN_USERmacrosavailableondarwin9Thankspatch">trunk/dports/lang/llvm-3.4/files/0005-_CS_DARWIN_USER-macros-available-on-darwin-9.-Thanks.patch</a></li>
<li><a href="#trunkdportslangllvm34files0006FixdylibinstallnamewhenbuildingonTigerpatch">trunk/dports/lang/llvm-3.4/files/0006-Fix-dylib-install-name-when-building-on-Tiger.patch</a></li>
<li><a href="#trunkdportslangllvm34files1010FixdylibinstallnamewhenbuildingonTigerpatch">trunk/dports/lang/llvm-3.4/files/1010-Fix-dylib-install-name-when-building-on-Tiger.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm34filesfixclangdylibidspatch">trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch</a></li>
<li><a href="#trunkdportslangllvm34filesfixdylibidspatch">trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvm34Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/Portfile (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -112,7 +112,8 @@
</span><span class="cx"> 0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch \
</span><span class="cx"> 0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch \
</span><span class="cx"> 0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \
</span><del>- fix-dylib-ids.patch
</del><ins>+ 0005-_CS_DARWIN_USER-macros-available-on-darwin-9.-Thanks.patch \
+ 0006-Fix-dylib-install-name-when-building-on-Tiger.patch
</ins><span class="cx">
</span><span class="cx"> if {${subport} eq "clang-${llvm_version}"} {
</span><span class="cx"> patchfiles-append \
</span><span class="lines">@@ -120,10 +121,12 @@
</span><span class="cx"> 1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
</span><span class="cx"> 1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch \
</span><span class="cx"> 1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
</span><ins>+ 1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch \
</ins><span class="cx"> 1006-Default-to-ppc7400-for-OSX-10.5.patch \
</span><span class="cx"> 1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch \
</span><span class="cx"> 1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch \
</span><span class="cx"> 1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
</span><ins>+ 1010-Fix-dylib-install-name-when-building-on-Tiger.patch \
</ins><span class="cx"> 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
</span><span class="cx"> 2002-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch \
</span><span class="cx"> 3001-buildit-build-fix-for-Leopard.patch \
</span><span class="lines">@@ -131,8 +134,7 @@
</span><span class="cx"> 3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
</span><span class="cx"> 3004-Fix-missing-long-long-math-prototypes-when-using-the.patch \
</span><span class="cx"> 3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
</span><del>- compiler_rt-toolchain.patch \
- fix-clang-dylib-ids.patch
</del><ins>+ compiler_rt-toolchain.patch
</ins><span class="cx">
</span><span class="cx"> # I'm not sure if we need to delete this. It seems to build fine with it
</span><span class="cx"> # present, but we used to explicitly only use this patch for the llvm subport.
</span></span></pre></div>
<a id="trunkdportslangllvm34files0001MacPortsOnlyUpdateinstalltargetsforclangsubpopatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From 8462fd916cfd76a4871e67cac0527d67bd65b5f6 Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 16:33:09 -0800
</span><del>-Subject: [PATCH 1/4] MacPorts Only: Update install targets for clang subport
</del><ins>+Subject: [PATCH 1/6] MacPorts Only: Update install targets for clang subport
</ins><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> (cherry picked from commit b514fa09a560de0b3241c6af0d134bae09a6aec3)
</span></span></pre></div>
<a id="trunkdportslangllvm34files0002MacPortsOnlySkipcheckingforpythoninconfigurepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From dc6e6e5c54168582a1127126797ae34cd8668b5b Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 16:43:00 -0800
</span><del>-Subject: [PATCH 2/4] MacPorts Only: Skip checking for python in configure
</del><ins>+Subject: [PATCH 2/6] MacPorts Only: Skip checking for python in configure
</ins><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> (cherry picked from commit cf8cce2b5201c8113a73bb2c0c5e5f6a2d9085b8)
</span></span></pre></div>
<a id="trunkdportslangllvm34files0003MacPortsOnlyFixsampleprojectregextoworkwithpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From f44378e03d9806b0b528b8589a4c705a9c564889 Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 18:52:14 -0800
</span><del>-Subject: [PATCH 3/4] MacPorts Only: Fix sample project regex to work with
</del><ins>+Subject: [PATCH 3/6] MacPorts Only: Fix sample project regex to work with
</ins><span class="cx"> multiple digit versions
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span></span></pre></div>
<a id="trunkdportslangllvm34files0004SettheMachOCPUSubtypetoppc7400whentargetingpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From 93300e85de8ff472bd8bfba2850ad9111eb0c080 Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 09:03:43 -0800
</span><del>-Subject: [PATCH 4/4] Set the Mach-O CPU Subtype to ppc7400 when targeting
</del><ins>+Subject: [PATCH 4/6] Set the Mach-O CPU Subtype to ppc7400 when targeting
</ins><span class="cx"> Leopard
</span><span class="cx">
</span><span class="cx"> http://llvm.org/bugs/show_bug.cgi?id=18463
</span></span></pre></div>
<a id="trunkdportslangllvm34files0005_CS_DARWIN_USERmacrosavailableondarwin9Thankspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.4/files/0005-_CS_DARWIN_USER-macros-available-on-darwin-9.-Thanks.patch (0 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+From 05ff848a0f4643678c5cfa3e56cdacbd40baa15a Mon Sep 17 00:00:00 2001
+From: David Fang <fang@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
+
</ins></span></pre></div>
<a id="trunkdportslangllvm34files0006FixdylibinstallnamewhenbuildingonTigerpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.4/files/0006-Fix-dylib-install-name-when-building-on-Tiger.patch (0 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+From 0e2fd2e555599cc88b757a40ea69ab2d70bc1811 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@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@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
+
</ins></span></pre></div>
<a id="trunkdportslangllvm34files1001MacPortsOnlyPrepareclangformatforreplacementwpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From 47d961284ee5012426d7ed9aa694c5092ec77d09 Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 17:50:24 -0800
</span><del>-Subject: [PATCH 1001/1009] MacPorts Only: Prepare clang-format for replacement
</del><ins>+Subject: [PATCH 1001/1010] MacPorts Only: Prepare clang-format for replacement
</ins><span class="cx"> with absolute path
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span></span></pre></div>
<a id="trunkdportslangllvm34files1002MacPortsOnlyFixnameofscanviewexecutableinsidpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From b63ecbd1b0a7b65e736bcd3be08cd6935ec2b49e Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 17:55:27 -0800
</span><del>-Subject: [PATCH 1002/1009] MacPorts Only: Fix name of scan-view executable
</del><ins>+Subject: [PATCH 1002/1010] MacPorts Only: Fix name of scan-view executable
</ins><span class="cx"> inside scan-build
</span><span class="cx">
</span><span class="cx"> http://trac.macports.org/ticket/35006
</span></span></pre></div>
<a id="trunkdportslangllvm34files1003MacPortsOnlyFixlibclang_rtdylibidspatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From cc0e2a7b162eea6f7918dd29cfbbcd96aaa59a09 Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 17:56:44 -0800
</span><del>-Subject: [PATCH 1003/1009] MacPorts Only: Fix libclang_rt dylib ids
</del><ins>+Subject: [PATCH 1003/1010] MacPorts Only: Fix libclang_rt dylib ids
</ins><span class="cx">
</span><span class="cx"> We should probably not be shipping these.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm34files1004MacPortsOnlyRelocateclangresourcesusingllvmvepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From 6c249a820605f4e2f998d5849b5be1005bf480e3 Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 17:58:25 -0800
</span><del>-Subject: [PATCH 1004/1009] MacPorts Only: Relocate clang resources using llvm
</del><ins>+Subject: [PATCH 1004/1010] MacPorts Only: Relocate clang resources using llvm
</ins><span class="cx"> version
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span></span></pre></div>
<a id="trunkdportslangllvm34files1005Callpowerpcdarwinexternaltoolswitharchppcpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From e149c95a9e4135360256d4037c6a9718e6c03f97 Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Rafael Espindola <rafael.espindola@gmail.com>
</span><span class="cx"> Date: Thu, 28 Aug 2014 21:23:05 +0000
</span><del>-Subject: [PATCH 1005/1009] Call powerpc-darwin external tools with -arch ppc.
</del><ins>+Subject: [PATCH 1005/1010] Call powerpc-darwin external tools with -arch ppc.
</ins><span class="cx">
</span><span class="cx"> With this patch we call external tools for powerpc-darwin with "-arch ppc"
</span><span class="cx"> instead of "-arch powerpc", so as to be compatible with the cctools assembler
</span></span></pre></div>
<a id="trunkdportslangllvm34files1006Defaulttoppc7400forOSX105patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From 0a8c33e1e541afd67d1e73dbb5c3dce7642ce9c2 Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Iain Sandoe <iain@codesourcery.com>
</span><span class="cx"> Date: Sun, 27 Jul 2014 20:35:16 +0100
</span><del>-Subject: [PATCH 1006/1009] Default to ppc7400 for OSX 10.5+
</del><ins>+Subject: [PATCH 1006/1010] Default to ppc7400 for OSX 10.5+
</ins><span class="cx">
</span><span class="cx"> (cherry picked from commit 971aa68baad8c240f1abf30e62bd947a8923e3fa)
</span><span class="cx"> ---
</span></span></pre></div>
<a id="trunkdportslangllvm34files1007reinstatefnoobjclegacydispatchbehaviorwhenthepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From f19c8901645037dcf8fb45a3d3ae25653a40df78 Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Fariborz Jahanian <fjahanian@apple.com>
</span><span class="cx"> Date: Mon, 20 Jan 2014 19:32:33 +0000
</span><del>-Subject: [PATCH 1007/1009] reinstate -fno-objc-legacy-dispatch behavior when
</del><ins>+Subject: [PATCH 1007/1010] reinstate -fno-objc-legacy-dispatch behavior when
</ins><span class="cx"> the deployment target is 10.5 or earlier
</span><span class="cx">
</span><span class="cx"> <rdar://problem/18971940>
</span></span></pre></div>
<a id="trunkdportslangllvm34files1008Change__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From ab94d8e941daedf76ac64fdbd48f55e7f76f8fcd Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Bob Wilson <bob.wilson@apple.com>
</span><span class="cx"> Date: Fri, 8 Aug 2014 21:45:53 +0000
</span><del>-Subject: [PATCH 1008/1009] Change
</del><ins>+Subject: [PATCH 1008/1010] Change
</ins><span class="cx"> __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ for versions > 10.9.
</span><span class="cx">
</span><span class="cx"> The previous encoding only allowed a single digit for the minor version
</span></span></pre></div>
<a id="trunkdportslangllvm34files1009OnlycallsetpriorityPRIO_DARWIN_THREAD0PRIO_DARWpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> From a77967e715ba05ad0b295efeb4b81554a4f978e7 Mon Sep 17 00:00:00 2001
</span><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 19:08:57 -0800
</span><del>-Subject: [PATCH 1009/1009] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</del><ins>+Subject: [PATCH 1009/1010] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</ins><span class="cx"> PRIO_DARWIN_BG) if it is available
</span><span class="cx">
</span><span class="cx"> Tiger and earlier versions of darwin do not support this.
</span></span></pre></div>
<a id="trunkdportslangllvm34files1010FixdylibinstallnamewhenbuildingonTigerpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.4/files/1010-Fix-dylib-install-name-when-building-on-Tiger.patch (0 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+From f87a09a7b12c8c6eeaf74df7ecefd9d6c81763cf Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@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@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
+
</ins></span></pre></div>
<a id="trunkdportslangllvm34filesfixclangdylibidspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-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)
</del></span></pre></div>
<a id="trunkdportslangllvm34filesfixdylibidspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch (131781 => 131782)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-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
</del></span></pre>
</div>
</div>
</body>
</html>