<!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>[142970] trunk/dports/lang/llvm-3.8</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/142970">142970</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-11-30 10:12:49 -0800 (Mon, 30 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>llvm-3.8: Build with cmake instead of autoconf</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm38Portfile">trunk/dports/lang/llvm-3.8/Portfile</a></li>
<li><a href="#trunkdportslangllvm38files2001MacPortsOnlyCommentoutSLcctoolsworkaroundpatch">trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch</a></li>
<li><a href="#trunkdportslangllvm38files2002UpdateCheckArchestofallbackonIntelppcifldvpatch">trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch</a></li>
<li><a href="#trunkdportslangllvm38files2003Fallbackonxcodebuildsdkwhenxcrunsdkisnotsupatch">trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch</a></li>
<li><a href="#trunkdportslangllvm38files2004Ondarwinbuildppcslicesofthecompilerruntimeipatch">trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch</a></li>
<li><a href="#trunkdportslangllvm38files2005MacPortsOnlyDontbuildx86_64hsliceofcompilerpatch">trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch</a></li>
<li><a href="#trunkdportslangllvm38files2006MacPortsOnlyFixregressionintroducedwhenfixingpatch">trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch</a></li>
<li><a href="#trunkdportslangllvm38filesleopardnoasanpatch">trunk/dports/lang/llvm-3.8/files/leopard-no-asan.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm38files2007MacPortsOnlyDontcheckforthemacosxinternalSDpatch">trunk/dports/lang/llvm-3.8/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvm38Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/Portfile (142969 => 142970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/Portfile 2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/Portfile 2015-11-30 18:12:49 UTC (rev 142970)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx"> PortGroup active_variants 1.1
</span><ins>+PortGroup cmake 1.0
</ins><span class="cx">
</span><span class="cx"> set llvm_version 3.8
</span><span class="cx"> set llvm_version_no_dot 38
</span><span class="lines">@@ -70,11 +71,13 @@
</span><span class="cx"> set libcxx_rev ${svn.revision}
</span><span class="cx"> set clang-modernize_rev ${svn.revision}
</span><span class="cx"> version ${llvm_version}-r${svn.revision}
</span><ins>+revision 1
</ins><span class="cx"> worksrcdir trunk
</span><span class="cx"> svn.url https://llvm.org/svn/llvm-project/llvm/trunk
</span><span class="cx"> #worksrcdir release_${llvm_version_no_dot}
</span><span class="cx"> #svn.url https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
</span><span class="cx"> default_variants-append +assertions
</span><ins>+default_variants-append +debug
</ins><span class="cx">
</span><span class="cx"> #version ${llvm_version}.0
</span><span class="cx"> #epoch 1
</span><span class="lines">@@ -119,6 +122,7 @@
</span><span class="cx"> 2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch \
</span><span class="cx"> 2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch \
</span><span class="cx"> 2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch \
</span><ins>+ 2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch \
</ins><span class="cx"> 3001-buildit-build-fix-for-Leopard.patch \
</span><span class="cx"> 3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
</span><span class="cx"> 3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
</span><span class="lines">@@ -130,26 +134,30 @@
</span><span class="cx"> # present, but we used to explicitly only use this patch for the llvm subport.
</span><span class="cx"> patchfiles-delete \
</span><span class="cx"> 0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
</span><del>-
- build.target clang-only
- destroot.target install-clang
</del><span class="cx"> }
</span><span class="cx">
</span><del>-build.env-append VERBOSE=1 \
- REQUIRES_RTTI=1
-destroot.env-append VERBOSE=1 \
- REQUIRES_RTTI=1
</del><ins>+configure.post_args ../${worksrcdir}
+default configure.dir {${workpath}/build}
+default build.dir {${workpath}/build}
</ins><span class="cx">
</span><del>-configure.dir ${workpath}/build
-build.dir ${configure.dir}
</del><ins>+# https://llvm.org/bugs/show_bug.cgi?id=25664
+configure.ldflags-append -Wl,-rpath,@loader_path
</ins><span class="cx">
</span><del>-configure.cmd ${worksrcpath}/configure
-configure.pre_args-delete --prefix=${prefix}
-configure.args --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
- --enable-optimized --disable-profiling --enable-pic \
- --enable-debug-symbols --disable-debug-runtime \
- --prefix="${sub_prefix}" --disable-assertions
</del><ins>+# https://llvm.org/bugs/show_bug.cgi?id=25674
+configure.cxxflags-append -std=c++11
</ins><span class="cx">
</span><ins>+configure.args-append \
+ -DLLVM_BUILD_LLVM_DYLIB=ON \
+ -DCMAKE_INSTALL_PREFIX="${sub_prefix}" \
+ -DLLVM_ENABLE_ASSERTIONS=OFF \
+ -DLLVM_ENABLE_RTTI=ON \
+ -DLLVM_INCLUDE_TESTS=OFF \
+ -DLLVM_INCLUDE_EXAMPLES=OFF \
+ -DLLVM_ENABLE_FFI=ON \
+ -DLLVM_BINDINGS_LIST=none \
+ -DFFI_INCLUDE_DIR=${prefix}/include \
+ -DFFI_LIBRARY_DIR=${prefix}/lib
+
</ins><span class="cx"> if {${subport} eq "llvm-${llvm_version}"} {
</span><span class="cx"> select.group llvm
</span><span class="cx"> select.file ${filespath}/mp-${subport}
</span><span class="lines">@@ -157,7 +165,15 @@
</span><span class="cx"> select.group clang
</span><span class="cx"> select.file ${filespath}/mp-${subport}
</span><span class="cx">
</span><del>- configure.args-append --with-python=${prefix}/bin/python2.7 --disable-clang-static-analyzer
</del><ins>+ configure.args-append \
+ -DCLANG_INCLUDE_TESTS=OFF \
+ -DCLANG_ENABLE_STATIC_ANALYZER=OFF
+
+ # https://llvm.org/bugs/show_bug.cgi?id=25665
+ configure.args-append \
+ -DLLVM_BUILD_RUNTIME=ON \
+ -DLIBCXX_INSTALL_LIBRARY=OFF \
+ -DLIBCXX_ENABLE_SHARED=OFF
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # llvm-3.5 and later requires a C++11 runtime
</span><span class="lines">@@ -200,13 +216,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant universal {
</span><del>- build.env-append \
- UNIVERSAL=1 \
- UNIVERSAL_ARCH="[get_canonical_archs]"
- destroot.env-append \
- UNIVERSAL=1 \
- UNIVERSAL_ARCH="[get_canonical_archs]"
-
</del><span class="cx"> post-extract {
</span><span class="cx"> # workaround a bug in Apple's shipped gcc driver-driver, patched in
</span><span class="cx"> # ours with driverdriver-num_infiles.patch
</span><span class="lines">@@ -219,29 +228,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
</span><del>- configure.args-delete --disable-assertions
- configure.args-append --enable-assertions
</del><ins>+ configure.args-delete -DLLVM_ENABLE_ASSERTIONS=OFF
+ configure.args-append -DLLVM_ENABLE_ASSERTIONS=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><del>- if {${build_arch} eq "i386"} {
- configure.pre_args-append --build=i686-apple-darwin${os.major}
- } elseif {${build_arch} eq "ppc"} {
- configure.pre_args-append --build=powerpc-apple-darwin${os.major}
- } elseif {${build_arch} eq "ppc64"} {
- configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
- } else {
- configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
- }
-
</del><span class="cx"> if {[string match "*ppc*" [get_canonical_archs]]} {
</span><span class="cx"> # http://trac.macports.org/ticket/33987
</span><del>- configure.args-append --with-optimize-option=-Os
</del><span class="cx"> configure.optflags -Os
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${subport} eq "clang-${llvm_version}" && [vercmp $xcodeversion 5.0] < 0} {
</span><ins>+ # https://llvm.org/bugs/show_bug.cgi?id=13671
</ins><span class="cx"> patchfiles-append leopard-no-asan.patch
</span><ins>+ configure.args-append -DCOMPILER_RT_HAS_SANITIZER_COMMON=NO
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> if {${os.major} < 11} {
</span><span class="cx"> # Proxy for eliminating the dependency on native TLS
</span><span class="cx"> # http://trac.macports.org/ticket/46887
</span><del>- configure.args-append --disable-backtraces
</del><ins>+ configure.args-append -DLLVM_ENABLE_BACKTRACES=OFF
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -288,18 +288,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-post-patch {
- if {${subport} eq "clang-${llvm_version}"} {
- reinplace "s|@@PREFIX@@|${prefix}|g" \
- ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk \
- ${worksrcpath}/projects/compiler-rt/make/platform/clang_macho_embedded.mk
</del><ins>+if {${subport} eq "clang-${llvm_version}"} {
+ destroot {
+ system "cd ${destroot.dir}/tools/clang && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
+ system "cd ${destroot.dir}/projects/compiler-rt && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
+ system "cd ${destroot.dir}/projects/libcxx && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
+
+ delete ${destroot}${sub_prefix}/bin/clang
+ file rename ${destroot}${sub_prefix}/bin/clang-${llvm_version} ${destroot}${sub_prefix}/bin/clang
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- file mkdir ${destroot}${prefix}/share/doc
- file rename ${destroot}${sub_prefix}/docs/llvm ${destroot}${prefix}/share/doc/${subport}
-
</del><span class="cx"> foreach bin [glob ${destroot}${sub_prefix}/bin/*] {
</span><span class="cx"> set bin_filename [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
</span><span class="cx"> set exec_path [string map "${destroot}${sub_prefix} ${sub_prefix}" ${bin}]
</span><span class="lines">@@ -314,6 +314,11 @@
</span><span class="cx"> # set basename [string map "${destroot}${sub_prefix}/share/man/man1/ {}" ${man}]
</span><span class="cx"> # file rename ${man} ${destroot}${prefix}/share/man/man1/[string map ".1 -${suffix}.1" ${basename}]
</span><span class="cx"> #}
</span><ins>+
+ # https://llvm.org/bugs/show_bug.cgi?id=19465
+ if {[variant_isset polly]} {
+ ln -s LLVMPolly.so ${destroot}${sub_prefix}/lib/LLVMPolly.dylib
+ }
</ins><span class="cx"> } elseif {${subport} eq "clang-${llvm_version}"} {
</span><span class="cx"> system "ditto ${worksrcpath}/projects/libcxx/include ${destroot}${sub_prefix}/lib/c++/v1"
</span><span class="cx">
</span><span class="lines">@@ -330,8 +335,8 @@
</span><span class="cx"> variant ocaml description {Enable generation of OCaml binding} {
</span><span class="cx"> depends_lib-append port:ocaml
</span><span class="cx">
</span><del>- configure.args-delete --enable-bindings=none
- configure.args-append --enable-bindings=ocaml
</del><ins>+ configure.args-delete -DLLVM_BINDINGS_LIST=none
+ configure.args-append -DLLVM_BINDINGS_LIST=ocaml
</ins><span class="cx">
</span><span class="cx"> destroot.args-append OVERRIDE_libdir=${sub_prefix}/lib
</span><span class="cx"> }
</span><span class="lines">@@ -345,8 +350,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant analyzer description {Install clang static analyzer} {
</span><del>- configure.args-delete --disable-clang-static-analyzer
- configure.args-append --enable-clang-static-analyzer
</del><ins>+ configure.args-delete \
+ -DCLANG_ENABLE_STATIC_ANALYZER=OFF
+ configure.args-append \
+ -DCLANG_ENABLE_STATIC_ANALYZER=ON
</ins><span class="cx">
</span><span class="cx"> depends_run-append port:perl5
</span><span class="cx">
</span><span class="lines">@@ -359,27 +366,11 @@
</span><span class="cx"> ${worksrcpath}/tools/clang/tools/scan-build/bin/set-xcode-analyzer \
</span><span class="cx"> ${worksrcpath}/tools/clang/tools/scan-view/bin/scan-view
</span><span class="cx"> }
</span><del>-
- post-destroot {
- file mkdir ${destroot}${sub_prefix}/libexec
- file copy ${worksrcpath}/tools/clang/tools/scan-build ${destroot}${sub_prefix}/libexec/scan-build
- file copy ${worksrcpath}/tools/clang/tools/scan-view ${destroot}${sub_prefix}/libexec/scan-view
-
- ln -s ${sub_prefix}/libexec/scan-build/bin/scan-build ${destroot}${sub_prefix}/bin/scan-build
- ln -s ${sub_prefix}/libexec/scan-view/bin/scan-view ${destroot}${sub_prefix}/bin/scan-view
- ln -s ${sub_prefix}/bin/clang ${destroot}${sub_prefix}/libexec/scan-build/bin/clang
-
- xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/scan-build-${suffix}"
- reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-build:" "${destroot}${prefix}/bin/scan-build-${suffix}"
-
- xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/scan-view-${suffix}"
- reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-view:" "${destroot}${prefix}/bin/scan-view-${suffix}"
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant openmp description {Use MacPorts' provided libomp with -fopenmp} {
</span><del>- configure.args-append \
- --with-clang-default-openmp-runtime=libomp
</del><ins>+ configure.args-append -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
</ins><span class="cx"> depends_lib-append port:libomp
</span><span class="cx"> patchfiles-append openmp-locations.patch
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files2001MacPortsOnlyCommentoutSLcctoolsworkaroundpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch (142969 => 142970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-11-30 18:12:49 UTC (rev 142970)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 50fb9417b3c687ee774bbce476665c294694f8aa Mon Sep 17 00:00:00 2001
</del><ins>+From 2d2c241cda3099ec3900ee2924201d3d19eea69e Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Mon, 15 Apr 2013 22:38:18 -0700
</span><del>-Subject: [PATCH 2001/2006] MacPorts Only: Comment out SL cctools workaround
</del><ins>+Subject: [PATCH 2001/2007] MacPorts Only: Comment out SL cctools workaround
</ins><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> ---
</span><span class="lines">@@ -30,5 +30,5 @@
</span><span class="cx"> # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
</span><span class="cx"> # are intended to support and limit what we try to build to that.
</span><span class="cx"> --
</span><del>-2.6.2
</del><ins>+2.6.3
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files2002UpdateCheckArchestofallbackonIntelppcifldvpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (142969 => 142970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-11-30 18:12:49 UTC (rev 142970)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 59e78b2ee11d1f17dbc8375a9b19e042d4726805 Mon Sep 17 00:00:00 2001
</del><ins>+From 1f0a6b8bdd5b4e4d00eb039f4ebd9dc0a703c091 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 10 Jan 2015 03:34:51 -0800
</span><del>-Subject: [PATCH 2002/2006] Update CheckArches to fallback on Intel/ppc if ld
</del><ins>+Subject: [PATCH 2002/2007] Update CheckArches to fallback on Intel/ppc if ld
</ins><span class="cx"> -v doesn't report supported architectures
</span><span class="cx">
</span><span class="cx"> Older versions of ld64 (eg: Xcode 3.x) do not report this.
</span><span class="lines">@@ -28,5 +28,5 @@
</span><span class="cx"> -integrated-as \
</span><span class="cx"> $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
</span><span class="cx"> --
</span><del>-2.6.2
</del><ins>+2.6.3
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files2003Fallbackonxcodebuildsdkwhenxcrunsdkisnotsupatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch (142969 => 142970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-11-30 18:12:49 UTC (rev 142970)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 88513020c3551b89e0b0fd5d72632dc5cff68794 Mon Sep 17 00:00:00 2001
</del><ins>+From 4d677715aded5099cadcb7c647729d05a7126930 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 17:45:27 -0800
</span><del>-Subject: [PATCH 2003/2006] Fall back on xcodebuild -sdk when xcrun --sdk is
</del><ins>+Subject: [PATCH 2003/2007] Fall back on xcodebuild -sdk when xcrun --sdk is
</ins><span class="cx"> not supported
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="lines">@@ -25,5 +25,5 @@
</span><span class="cx"> fi; \
</span><span class="cx"> echo $$result)
</span><span class="cx"> --
</span><del>-2.6.2
</del><ins>+2.6.3
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files2004Ondarwinbuildppcslicesofthecompilerruntimeipatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch (142969 => 142970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-11-30 18:12:49 UTC (rev 142970)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From c60d1653bc6cb8d3f79cb5054a1024f06363174d Mon Sep 17 00:00:00 2001
</del><ins>+From efbd8b49c0815fa8a83f8d4cef51e8d0de3cbfad Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 17 Jan 2015 19:55:19 -0800
</span><del>-Subject: [PATCH 2004/2006] On darwin, build ppc slices of the compiler runtime
</del><ins>+Subject: [PATCH 2004/2007] On darwin, build ppc slices of the compiler runtime
</ins><span class="cx"> if requested and supported by the SDK and toolchain
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="lines">@@ -51,5 +51,5 @@
</span><span class="cx"> UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK))
</span><span class="cx"> UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
</span><span class="cx"> --
</span><del>-2.6.2
</del><ins>+2.6.3
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files2005MacPortsOnlyDontbuildx86_64hsliceofcompilerpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch (142969 => 142970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-11-30 18:12:49 UTC (rev 142970)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From a5e3429759eb0f15bbd576d6c96355ea72378fd9 Mon Sep 17 00:00:00 2001
</del><ins>+From 1c58350ef60e7b54d8b0ef6ea58791d6e8390b90 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Wed, 14 Jan 2015 19:55:19 -0800
</span><del>-Subject: [PATCH 2005/2006] MacPorts Only: Don't build x86_64h slice of
</del><ins>+Subject: [PATCH 2005/2007] MacPorts Only: Don't build x86_64h slice of
</ins><span class="cx"> compiler-rt
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="lines">@@ -52,5 +52,5 @@
</span><span class="cx"> Configs += ubsan_iossim_dynamic
</span><span class="cx"> UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_iossim_dynamic,$(IOSSIM_SDK))
</span><span class="cx"> --
</span><del>-2.6.2
</del><ins>+2.6.3
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files2006MacPortsOnlyFixregressionintroducedwhenfixingpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch (142969 => 142970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2015-11-30 18:12:49 UTC (rev 142970)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From fadf6c4a22a7d8a6a99acb05175669b68b8b317b Mon Sep 17 00:00:00 2001
</del><ins>+From 7664b6e22365f91d330bf10f3255ad4190410000 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sun, 11 Oct 2015 09:02:26 -0700
</span><del>-Subject: [PATCH 2006/2006] MacPorts Only: Fix regression introduced when
</del><ins>+Subject: [PATCH 2006/2007] MacPorts Only: Fix regression introduced when
</ins><span class="cx"> fixing PR24776
</span><span class="cx">
</span><span class="cx"> Partially reverts commit efecb2c285bd444b6def43ac62e5f0278df387eb
</span><span class="lines">@@ -25,5 +25,5 @@
</span><span class="cx"> $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
</span><span class="cx"> -isysroot $(3) \
</span><span class="cx"> --
</span><del>-2.6.2
</del><ins>+2.6.3
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangllvm38files2007MacPortsOnlyDontcheckforthemacosxinternalSDpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/llvm-3.8/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch (0 => 142970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch 2015-11-30 18:12:49 UTC (rev 142970)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+From 4cf3736c2a21e608d12b0fc153533be359029d7b Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Mon, 30 Nov 2015 00:52:14 -0500
+Subject: [PATCH 2007/2007] MacPorts Only: Don't check for the macosx.internal
+ SDK
+
+https://llvm.org/bugs/show_bug.cgi?id=25677
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ cmake/Modules/CompilerRTDarwinUtils.cmake | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
+index 4947ae4..611756a 100644
+--- llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
++++ macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
+@@ -2,21 +2,12 @@
+ # set the default Xcode to use. This function finds the SDKs that are present in
+ # the current Xcode.
+ function(find_darwin_sdk_dir var sdk_name)
+- # Let's first try the internal SDK, otherwise use the public SDK.
+- execute_process(
+- COMMAND xcodebuild -version -sdk ${sdk_name}.internal Path
+- OUTPUT_VARIABLE var_internal
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- ERROR_FILE /dev/null
+- )
+- if("" STREQUAL "${var_internal}")
+ execute_process(
+ COMMAND xcodebuild -version -sdk ${sdk_name} Path
+ OUTPUT_VARIABLE var_internal
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ ERROR_FILE /dev/null
+ )
+- endif()
+ set(${var} ${var_internal} PARENT_SCOPE)
+ endfunction()
+
+--
+2.6.3
+
</ins></span></pre></div>
<a id="trunkdportslangllvm38filesleopardnoasanpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.8/files/leopard-no-asan.patch (142969 => 142970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.8/files/leopard-no-asan.patch 2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/leopard-no-asan.patch 2015-11-30 18:12:49 UTC (rev 142970)
</span><span class="lines">@@ -46,3 +46,15 @@
</span><span class="cx"> RuntimeLibrary.macho_embedded.Configs := \
</span><span class="cx"> hard_static.a hard_pic.a
</span><span class="cx"> ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD)))
</span><ins>+--- a/projects/compiler-rt/cmake/config-ix.cmake 2015-11-29 22:17:04.000000000 -0800
++++ b/projects/compiler-rt/cmake/config-ix.cmake 2015-11-29 22:19:16.000000000 -0800
+@@ -313,9 +313,6 @@ if(APPLE)
+ else()
+ set(SANITIZER_MIN_OSX_VERSION 10.9)
+ endif()
+- if(SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.7")
+- message(FATAL_ERROR "Too old OS X version: ${SANITIZER_MIN_OSX_VERSION}")
+- endif()
+ endif()
+
+ # We're setting the flag manually for each target OS
</ins></span></pre>
</div>
</div>
</body>
</html>