<!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>[131809] trunk/dports/lang</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/131809">131809</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-01-19 00:13:18 -0800 (Mon, 19 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>llvm-3.[67]: Remove disable-arm-runtime.patch patch as current compiler-rt determines this automatically</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm36Portfile">trunk/dports/lang/llvm-3.6/Portfile</a></li>
<li><a href="#trunkdportslangllvm37Portfile">trunk/dports/lang/llvm-3.7/Portfile</a></li>
<li><a href="#trunkdportslangllvm37filesleopardnoasanpatch">trunk/dports/lang/llvm-3.7/files/leopard-no-asan.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm36filesdisablearmruntimepatch">trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch</a></li>
<li><a href="#trunkdportslangllvm37filesdisablearmruntimepatch">trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvm36Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.6/Portfile (131808 => 131809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.6/Portfile 2015-01-19 07:13:08 UTC (rev 131808)
+++ trunk/dports/lang/llvm-3.6/Portfile 2015-01-19 08:13:18 UTC (rev 131809)
</span><span class="lines">@@ -126,11 +126,6 @@
</span><span class="cx"> patchfiles-delete \
</span><span class="cx"> 0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
</span><span class="cx">
</span><del>- if {![variant_isset arm_runtime]} {
- # Alternate fix for #33272.
- patchfiles-append disable-arm-runtime.patch
- }
-
</del><span class="cx"> build.target clang-only
</span><span class="cx"> destroot.target install-clang
</span><span class="cx"> }
</span><span class="lines">@@ -310,13 +305,6 @@
</span><span class="cx"> destroot.args-append OVERRIDE_libdir=${sub_prefix}/lib
</span><span class="cx"> }
</span><span class="cx"> } elseif {${subport} eq "clang-${llvm_version}"} {
</span><del>- variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
-
- # The iOS SDK was shipped with all Xcode releases after 4.0
- if {[info exists xcodeversion] && [vercmp "4.0" ${xcodeversion}] <= 0} {
- default_variants-append +arm_runtime
- }
-
</del><span class="cx"> variant analyzer description {Install clang static analyzer} {
</span><span class="cx"> depends_run-append port:perl5
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm36filesdisablearmruntimepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch (131808 => 131809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch 2015-01-19 07:13:08 UTC (rev 131808)
+++ trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch 2015-01-19 08:13:18 UTC (rev 131809)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-Index: llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-===================================================================
---- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -101,7 +101,6 @@ UniversalArchs.cc_kext += $(call CheckAr
- # Configuration for use with kernel/kexts for iOS 5.0 and earlier (which used
- # a different code generation strategy). Note: the x86_64 slice is unused but
- # it avoids build problems (see pr14013).
--Configs += cc_kext_ios5
- UniversalArchs.cc_kext_ios5 := $(call CheckArches,x86_64,cc_kext_ios5,$(IOSSIM_SDK))
- UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
-
-@@ -133,6 +132,8 @@ UniversalArchs.ubsan_osx := $(call Check
- #UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
- #endif
-
-+RC_SUPPORTED_ARCHS := ppc i386 x86_64 x86_64h
-+
- # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
- # are intended to support and limit what we try to build to that.
- ifneq ($(RC_SUPPORTED_ARCHS),)
-Index: llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-===================================================================
---- llvm-3.6svn.orig/tools/clang/runtime/compiler-rt/Makefile
-+++ llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-@@ -99,10 +99,6 @@ ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
- endif
-
--ifneq ($(IOS_SDK),)
--RuntimeLibrary.darwin.Configs += cc_kext_ios5.a
--endif
--
- ifneq ($(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib
- endif
</del></span></pre></div>
<a id="trunkdportslangllvm37Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/Portfile (131808 => 131809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/Portfile 2015-01-19 07:13:08 UTC (rev 131808)
+++ trunk/dports/lang/llvm-3.7/Portfile 2015-01-19 08:13:18 UTC (rev 131809)
</span><span class="lines">@@ -126,11 +126,6 @@
</span><span class="cx"> patchfiles-delete \
</span><span class="cx"> 0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
</span><span class="cx">
</span><del>- if {![variant_isset arm_runtime]} {
- # Alternate fix for #33272.
- patchfiles-append disable-arm-runtime.patch
- }
-
</del><span class="cx"> build.target clang-only
</span><span class="cx"> destroot.target install-clang
</span><span class="cx"> }
</span><span class="lines">@@ -310,13 +305,6 @@
</span><span class="cx"> destroot.args-append OVERRIDE_libdir=${sub_prefix}/lib
</span><span class="cx"> }
</span><span class="cx"> } elseif {${subport} eq "clang-${llvm_version}"} {
</span><del>- variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
-
- # The iOS SDK was shipped with all Xcode releases after 4.0
- if {[info exists xcodeversion] && [vercmp "4.0" ${xcodeversion}] <= 0} {
- default_variants-append +arm_runtime
- }
-
</del><span class="cx"> variant analyzer description {Install clang static analyzer} {
</span><span class="cx"> depends_run-append port:perl5
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm37filesdisablearmruntimepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch (131808 => 131809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch 2015-01-19 07:13:08 UTC (rev 131808)
+++ trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch 2015-01-19 08:13:18 UTC (rev 131809)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-Index: llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-===================================================================
---- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -101,7 +101,6 @@ UniversalArchs.cc_kext += $(call CheckAr
- # Configuration for use with kernel/kexts for iOS 5.0 and earlier (which used
- # a different code generation strategy). Note: the x86_64 slice is unused but
- # it avoids build problems (see pr14013).
--Configs += cc_kext_ios5
- UniversalArchs.cc_kext_ios5 := $(call CheckArches,x86_64,cc_kext_ios5,$(IOSSIM_SDK))
- UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
-
-@@ -133,6 +132,8 @@ UniversalArchs.ubsan_osx := $(call Check
- #UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
- #endif
-
-+RC_SUPPORTED_ARCHS := ppc i386 x86_64 x86_64h
-+
- # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
- # are intended to support and limit what we try to build to that.
- ifneq ($(RC_SUPPORTED_ARCHS),)
-Index: llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-===================================================================
---- llvm-3.6svn.orig/tools/clang/runtime/compiler-rt/Makefile
-+++ llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-@@ -99,10 +99,6 @@ ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
- endif
-
--ifneq ($(IOS_SDK),)
--RuntimeLibrary.darwin.Configs += cc_kext_ios5.a
--endif
--
- ifneq ($(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib
- endif
</del></span></pre></div>
<a id="trunkdportslangllvm37filesleopardnoasanpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.7/files/leopard-no-asan.patch (131808 => 131809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.7/files/leopard-no-asan.patch 2015-01-19 07:13:08 UTC (rev 131808)
+++ trunk/dports/lang/llvm-3.7/files/leopard-no-asan.patch 2015-01-19 08:13:18 UTC (rev 131809)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+--- a/projects/compiler-rt/make/platform/clang_darwin.mk.orig 2015-01-10 03:41:48.000000000 -0800
++++ b/projects/compiler-rt/make/platform/clang_darwin.mk 2015-01-10 04:13:39.000000000 -0800
+@@ -115,13 +115,13 @@ UniversalArchs.profile_ios := $(call Che
+ UniversalArchs.profile_ios += $(call CheckArches,armv7,profile_ios,$(IOS_SDK))
+
+ # Configurations which define the ASAN support functions.
+-Configs += asan_osx_dynamic
++#Configs += asan_osx_dynamic
+ UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
+
+-Configs += asan_iossim_dynamic
++#Configs += asan_iossim_dynamic
+ UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
+
+-Configs += ubsan_osx
++#Configs += ubsan_osx
+ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(OSX_SDK))
+
+ # Darwin 10.6 has a bug in cctools that makes it unable to use ranlib on our ARM
</ins><span class="cx"> --- a/tools/clang/runtime/compiler-rt/Makefile.orig 2015-01-08 23:42:54.000000000 -0800
</span><span class="cx"> +++ b/tools/clang/runtime/compiler-rt/Makefile 2015-01-10 04:13:59.000000000 -0800
</span><span class="cx"> @@ -78,9 +78,7 @@ ifeq ($(OS),Darwin)
</span></span></pre>
</div>
</div>
</body>
</html>