<!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>[129354] 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/129354">129354</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2014-12-10 15:33:22 -0800 (Wed, 10 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>{clang,llvm}-3.{4,5,6}: Compare strings with "eq" and "ne"
(Jeremy signed off via email.)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm34Portfile">trunk/dports/lang/llvm-3.4/Portfile</a></li>
<li><a href="#trunkdportslangllvm35Portfile">trunk/dports/lang/llvm-3.5/Portfile</a></li>
<li><a href="#trunkdportslangllvm36Portfile">trunk/dports/lang/llvm-3.6/Portfile</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 (129353 => 129354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.4/Portfile 2014-12-10 23:16:24 UTC (rev 129353)
+++ trunk/dports/lang/llvm-3.4/Portfile 2014-12-10 23:33:22 UTC (rev 129354)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> license NCSA
</span><span class="cx"> maintainers jeremyhu
</span><span class="cx">
</span><del>-if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> homepage http://llvm.org/
</span><span class="cx"> description llvm is a next generation compiler infrastructure
</span><span class="cx"> long_description The LLVM Core libraries provide a modern source- and \
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> depends_lib port:libffi
</span><span class="cx"> depends_run bin:perl:perl5 port:llvm_select
</span><del>-} elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+} elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> homepage http://clang.llvm.org/
</span><span class="cx"> description C, C++, Objective C and Objective C++ compiler
</span><span class="cx"> long_description Clang is an "LLVM native" C/C++/Objective-C compiler, \
</span><span class="lines">@@ -71,12 +71,12 @@
</span><span class="cx"> distfiles llvm-${version}.src${extract.suffix}
</span><span class="cx"> worksrcdir llvm-${version}.src
</span><span class="cx">
</span><del>-if {${distfiles} != ""} {
- if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${distfiles} ne ""} {
+ if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> if {[variant_isset polly]} {
</span><span class="cx"> distfiles-append polly-${llvm_version}.src${extract.suffix}
</span><span class="cx"> }
</span><del>- } elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+ } elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> distfiles-append cfe-${version}.src${extract.suffix} compiler-rt-${llvm_version}.src${extract.suffix} libcxx-${version}.src${extract.suffix} clang-tools-extra-${llvm_version}.src${extract.suffix}
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx">
</span><del>-if {${subport} == "clang-${llvm_version}"} {
</del><ins>+if {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> patchfiles-append tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
</span><span class="cx"> 0001-Comment-out-SL-cctools-workaround.patch \
</span><span class="cx"> 0001-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch \
</span><span class="lines">@@ -129,10 +129,10 @@
</span><span class="cx"> --enable-debug-symbols --disable-debug-runtime \
</span><span class="cx"> --prefix="${sub_prefix}"
</span><span class="cx">
</span><del>-if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> select.group llvm
</span><span class="cx"> select.file ${filespath}/mp-${subport}
</span><del>-} elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+} elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> select.group clang
</span><span class="cx"> select.file ${filespath}/mp-${subport}
</span><span class="cx">
</span><span class="lines">@@ -155,9 +155,9 @@
</span><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><del>- if {${configure.compiler} == "gcc-4.0" ||
- ${configure.compiler} == "gcc-4.2" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
</del><ins>+ if {${configure.compiler} eq "gcc-4.0" ||
+ ${configure.compiler} eq "gcc-4.2" ||
+ ${configure.compiler} eq "llvm-gcc-4.2"} {
</ins><span class="cx"> system "echo \"static int ___ignoreme;\" > ${worksrcpath}/tools/llvm-shlib/ignore.c"
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> configure.optflags -Os
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {${subport} == "clang-${llvm_version}" && ${os.major} <= 9} {
</del><ins>+ if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
</ins><span class="cx"> patchfiles-append leopard-no-asan.patch
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -211,23 +211,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>- if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+ if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> if {[variant_isset polly]} {
</span><del>- if {${worksrcdir} == "trunk"} {
</del><ins>+ if {${worksrcdir} eq "trunk"} {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/trunk polly"
</span><del>- } elseif {${worksrcdir} == "release_${llvm_version_no_dot}" } {
</del><ins>+ } elseif {${worksrcdir} eq "release_${llvm_version_no_dot}" } {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/branches/release_${llvm_version_no_dot} polly"
</span><span class="cx"> } else {
</span><span class="cx"> file rename ${workpath}/polly-${llvm_version} ${worksrcpath}/tools/polly
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } elseif {${subport} == "clang-${llvm_version}"} {
- if {${worksrcdir} == "trunk"} {
</del><ins>+ } elseif {${subport} eq "clang-${llvm_version}"} {
+ if {${worksrcdir} eq "trunk"} {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
</span><span class="cx"> system "cd ${worksrcpath}/tools/clang/tools && svn co -r ${clang-modernize_rev} http://llvm.org/svn/llvm-project/clang-tools-extra/trunk extra"
</span><del>- } elseif {${worksrcdir} == "release_${llvm_version_no_dot}" } {
</del><ins>+ } elseif {${worksrcdir} eq "release_${llvm_version_no_dot}" } {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_${llvm_version_no_dot} clang"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_${llvm_version_no_dot} compiler-rt"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_${llvm_version_no_dot} libcxx"
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- if {${subport} == "clang-${llvm_version}"} {
</del><ins>+ if {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> # http://trac.macports.org/ticket/33272
</span><span class="cx"> if {![variant_isset arm_runtime]} {
</span><span class="cx"> reinplace {/^SubDirs/ s/arm//} ${worksrcpath}/projects/compiler-rt/lib/Makefile.mk
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> reinplace "s:EXEC_PATH:${exec_path}:" "${bin_filename}"
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+ if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> # r156389 (a5d2435409858728970202226d0bbbee508fe408) temporarilary removed llvm man pages
</span><span class="cx"> #foreach man [glob ${destroot}${sub_prefix}/share/man/man1/*.1] {
</span><span class="cx"> # set basename [string map "${destroot}${sub_prefix}/share/man/man1/ {}" ${man}]
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> system "install_name_tool -change @rpath/${libb_base} ${libb_nodr} ${liba}"
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+ } elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> system "ditto ${worksrcpath}/projects/libcxx/include ${destroot}${sub_prefix}/lib/c++/v1"
</span><span class="cx">
</span><span class="cx"> # http://trac.macports.org/ticket/33207
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> system "install_name_tool -change @rpath/libLLVM-${llvm_version}svn.dylib ${sub_prefix}/lib/libLLVM-${llvm_version}svn.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
</span><span class="cx"> system "install_name_tool -change @rpath/libLLVM-${llvm_version}.dylib ${sub_prefix}/lib/libLLVM-${llvm_version}.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
</span><span class="cx">
</span><del>- if {${version} != ${llvm_version}} {
</del><ins>+ if {${version} ne ${llvm_version}} {
</ins><span class="cx"> file rename ${destroot}${sub_prefix}/lib/clang/${version} ${destroot}${sub_prefix}/lib/clang/${llvm_version}
</span><span class="cx"> ln -s ${llvm_version} ${destroot}${sub_prefix}/lib/clang/${version}
</span><span class="cx"> }
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> variant polly description {Provide the polly polyhedral optimizer} {
</span><span class="cx"> patchfiles-append polly-isl-0.13.patch
</span><span class="cx">
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx">
</span><span class="cx"> destroot.args-append OVERRIDE_libdir=${sub_prefix}/lib
</span><span class="cx"> }
</span><del>-} elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+} elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
</span><span class="cx">
</span><span class="cx"> # The iOS SDK was shipped with all Xcode releases after 4.0
</span></span></pre></div>
<a id="trunkdportslangllvm35Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.5/Portfile (129353 => 129354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/Portfile 2014-12-10 23:16:24 UTC (rev 129353)
+++ trunk/dports/lang/llvm-3.5/Portfile 2014-12-10 23:33:22 UTC (rev 129354)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> license NCSA
</span><span class="cx"> maintainers jeremyhu
</span><span class="cx">
</span><del>-if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> homepage http://llvm.org/
</span><span class="cx"> description llvm is a next generation compiler infrastructure
</span><span class="cx"> long_description The LLVM Core libraries provide a modern source- and \
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> if {[vercmp $xcodeversion 4.3] < 0 && [string match "*macports*" ${configure.compiler}]} {
</span><span class="cx"> depends_build-append port:cctools
</span><span class="cx"> }
</span><del>-} elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+} elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> homepage http://clang.llvm.org/
</span><span class="cx"> description C, C++, Objective C and Objective C++ compiler
</span><span class="cx"> long_description Clang is an "LLVM native" C/C++/Objective-C compiler, \
</span><span class="lines">@@ -78,12 +78,12 @@
</span><span class="cx"> distfiles llvm-${version}.src${extract.suffix}
</span><span class="cx"> worksrcdir llvm-${version}.src
</span><span class="cx">
</span><del>-if {${distfiles} != ""} {
- if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${distfiles} ne ""} {
+ if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> if {[variant_isset polly]} {
</span><span class="cx"> distfiles-append polly-${version}.src${extract.suffix}
</span><span class="cx"> }
</span><del>- } elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+ } elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> distfiles-append cfe-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix} libcxx-${version}.src${extract.suffix} clang-tools-extra-${version}.src${extract.suffix}
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx">
</span><del>-if {${subport} == "clang-${llvm_version}"} {
</del><ins>+if {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> patchfiles-append scan-build-PR-35006.patch \
</span><span class="cx"> 0001-PR21536-Fix-a-corner-case-where-we-d-get-confused-by.patch \
</span><span class="cx"> 0002-PR19372-Keep-checking-template-arguments-after-we-se.patch \
</span><span class="lines">@@ -134,10 +134,10 @@
</span><span class="cx"> --enable-debug-symbols --disable-debug-runtime \
</span><span class="cx"> --prefix="${sub_prefix}"
</span><span class="cx">
</span><del>-if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> select.group llvm
</span><span class="cx"> select.file ${filespath}/mp-${subport}
</span><del>-} elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+} elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> select.group clang
</span><span class="cx"> select.file ${filespath}/mp-${subport}
</span><span class="cx">
</span><span class="lines">@@ -177,9 +177,9 @@
</span><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><del>- if {${configure.compiler} == "gcc-4.0" ||
- ${configure.compiler} == "gcc-4.2" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
</del><ins>+ if {${configure.compiler} eq "gcc-4.0" ||
+ ${configure.compiler} eq "gcc-4.2" ||
+ ${configure.compiler} eq "llvm-gcc-4.2"} {
</ins><span class="cx"> system "echo \"static int ___ignoreme;\" > ${worksrcpath}/tools/llvm-shlib/ignore.c"
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -233,23 +233,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>- if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+ if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> if {[variant_isset polly]} {
</span><del>- if {${worksrcdir} == "trunk"} {
</del><ins>+ if {${worksrcdir} eq "trunk"} {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/trunk polly"
</span><del>- } elseif {${worksrcdir} == "release_${llvm_version_no_dot}" } {
</del><ins>+ } elseif {${worksrcdir} eq "release_${llvm_version_no_dot}" } {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/branches/release_${llvm_version_no_dot} polly"
</span><span class="cx"> } else {
</span><span class="cx"> file rename ${workpath}/polly-${version}.src ${worksrcpath}/tools/polly
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } elseif {${subport} == "clang-${llvm_version}"} {
- if {${worksrcdir} == "trunk"} {
</del><ins>+ } elseif {${subport} eq "clang-${llvm_version}"} {
+ if {${worksrcdir} eq "trunk"} {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
</span><span class="cx"> system "cd ${worksrcpath}/tools/clang/tools && svn co -r ${clang-modernize_rev} http://llvm.org/svn/llvm-project/clang-tools-extra/trunk extra"
</span><del>- } elseif {${worksrcdir} == "release_${llvm_version_no_dot}" } {
</del><ins>+ } elseif {${worksrcdir} eq "release_${llvm_version_no_dot}" } {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_${llvm_version_no_dot} clang"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_${llvm_version_no_dot} compiler-rt"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_${llvm_version_no_dot} libcxx"
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- if {${subport} == "clang-${llvm_version}"} {
</del><ins>+ if {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> # http://trac.macports.org/ticket/33272
</span><span class="cx"> if {![variant_isset arm_runtime]} {
</span><span class="cx"> reinplace {/^SubDirs/ s/arm//} ${worksrcpath}/projects/compiler-rt/lib/Makefile.mk
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> reinplace "s:EXEC_PATH:${exec_path}:" "${bin_filename}"
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+ if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> # r156389 (a5d2435409858728970202226d0bbbee508fe408) temporarilary removed llvm man pages
</span><span class="cx"> #foreach man [glob ${destroot}${sub_prefix}/share/man/man1/*.1] {
</span><span class="cx"> # set basename [string map "${destroot}${sub_prefix}/share/man/man1/ {}" ${man}]
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> system "install_name_tool -change @rpath/${libb_base} ${libb_nodr} ${liba}"
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+ } elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> system "ditto ${worksrcpath}/projects/libcxx/include ${destroot}${sub_prefix}/lib/c++/v1"
</span><span class="cx">
</span><span class="cx"> # http://trac.macports.org/ticket/33207
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> variant polly description {Provide the polly polyhedral optimizer} {
</span><span class="cx"> depends_lib-append \
</span><span class="cx"> port:gmp \
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx">
</span><span class="cx"> destroot.args-append OVERRIDE_libdir=${sub_prefix}/lib
</span><span class="cx"> }
</span><del>-} elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+} elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
</span><span class="cx">
</span><span class="cx"> # The iOS SDK was shipped with all Xcode releases after 4.0
</span></span></pre></div>
<a id="trunkdportslangllvm36Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.6/Portfile (129353 => 129354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.6/Portfile 2014-12-10 23:16:24 UTC (rev 129353)
+++ trunk/dports/lang/llvm-3.6/Portfile 2014-12-10 23:33:22 UTC (rev 129354)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> license NCSA
</span><span class="cx"> maintainers jeremyhu
</span><span class="cx">
</span><del>-if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> homepage http://llvm.org/
</span><span class="cx"> description llvm is a next generation compiler infrastructure
</span><span class="cx"> long_description The LLVM Core libraries provide a modern source- and \
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> if {[vercmp $xcodeversion 4.3] < 0 && [string match "*macports*" ${configure.compiler}]} {
</span><span class="cx"> depends_build-append port:cctools
</span><span class="cx"> }
</span><del>-} elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+} elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> homepage http://clang.llvm.org/
</span><span class="cx"> description C, C++, Objective C and Objective C++ compiler
</span><span class="cx"> long_description Clang is an "LLVM native" C/C++/Objective-C compiler, \
</span><span class="lines">@@ -78,12 +78,12 @@
</span><span class="cx"> #distfiles llvm-${version}.src${extract.suffix}
</span><span class="cx"> #worksrcdir llvm-${version}.src
</span><span class="cx">
</span><del>-if {${distfiles} != ""} {
- if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${distfiles} ne ""} {
+ if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> if {[variant_isset polly]} {
</span><span class="cx"> distfiles-append polly-${version}.src${extract.suffix}
</span><span class="cx"> }
</span><del>- } elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+ } elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> distfiles-append cfe-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix} libcxx-${version}.src${extract.suffix} clang-tools-extra-${version}.src${extract.suffix}
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx">
</span><del>-if {${subport} == "clang-${llvm_version}"} {
</del><ins>+if {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> patchfiles-append scan-build-PR-35006.patch \
</span><span class="cx"> 0001-Comment-out-SL-cctools-workaround.patch \
</span><span class="cx"> clang-format.patch \
</span><span class="lines">@@ -113,10 +113,10 @@
</span><span class="cx"> --enable-debug-symbols --disable-debug-runtime \
</span><span class="cx"> --prefix="${sub_prefix}"
</span><span class="cx">
</span><del>-if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> select.group llvm
</span><span class="cx"> select.file ${filespath}/mp-${subport}
</span><del>-} elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+} elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> select.group clang
</span><span class="cx"> select.file ${filespath}/mp-${subport}
</span><span class="cx">
</span><span class="lines">@@ -156,9 +156,9 @@
</span><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><del>- if {${configure.compiler} == "gcc-4.0" ||
- ${configure.compiler} == "gcc-4.2" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
</del><ins>+ if {${configure.compiler} eq "gcc-4.0" ||
+ ${configure.compiler} eq "gcc-4.2" ||
+ ${configure.compiler} eq "llvm-gcc-4.2"} {
</ins><span class="cx"> system "echo \"static int ___ignoreme;\" > ${worksrcpath}/tools/llvm-shlib/ignore.c"
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -212,23 +212,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>- if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+ if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> if {[variant_isset polly]} {
</span><del>- if {${worksrcdir} == "trunk"} {
</del><ins>+ if {${worksrcdir} eq "trunk"} {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/trunk polly"
</span><del>- } elseif {${worksrcdir} == "release_${llvm_version_no_dot}" } {
</del><ins>+ } elseif {${worksrcdir} eq "release_${llvm_version_no_dot}" } {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/branches/release_${llvm_version_no_dot} polly"
</span><span class="cx"> } else {
</span><span class="cx"> file rename ${workpath}/polly-${version}.src ${worksrcpath}/tools/polly
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } elseif {${subport} == "clang-${llvm_version}"} {
- if {${worksrcdir} == "trunk"} {
</del><ins>+ } elseif {${subport} eq "clang-${llvm_version}"} {
+ if {${worksrcdir} eq "trunk"} {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
</span><span class="cx"> system "cd ${worksrcpath}/tools/clang/tools && svn co -r ${clang-modernize_rev} http://llvm.org/svn/llvm-project/clang-tools-extra/trunk extra"
</span><del>- } elseif {${worksrcdir} == "release_${llvm_version_no_dot}" } {
</del><ins>+ } elseif {${worksrcdir} eq "release_${llvm_version_no_dot}" } {
</ins><span class="cx"> system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_${llvm_version_no_dot} clang"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_${llvm_version_no_dot} compiler-rt"
</span><span class="cx"> system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_${llvm_version_no_dot} libcxx"
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- if {${subport} == "clang-${llvm_version}"} {
</del><ins>+ if {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> # http://trac.macports.org/ticket/33272
</span><span class="cx"> if {![variant_isset arm_runtime]} {
</span><span class="cx"> reinplace {/^SubDirs/ s/arm//} ${worksrcpath}/projects/compiler-rt/lib/Makefile.mk
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> reinplace "s:EXEC_PATH:${exec_path}:" "${bin_filename}"
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+ if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> # r156389 (a5d2435409858728970202226d0bbbee508fe408) temporarilary removed llvm man pages
</span><span class="cx"> #foreach man [glob ${destroot}${sub_prefix}/share/man/man1/*.1] {
</span><span class="cx"> # set basename [string map "${destroot}${sub_prefix}/share/man/man1/ {}" ${man}]
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> system "install_name_tool -change @rpath/${libb_base} ${libb_nodr} ${liba}"
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+ } elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> system "ditto ${worksrcpath}/projects/libcxx/include ${destroot}${sub_prefix}/lib/c++/v1"
</span><span class="cx">
</span><span class="cx"> # http://trac.macports.org/ticket/33207
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {${subport} == "llvm-${llvm_version}"} {
</del><ins>+if {${subport} eq "llvm-${llvm_version}"} {
</ins><span class="cx"> variant polly description {Provide the polly polyhedral optimizer} {
</span><span class="cx"> depends_lib-append \
</span><span class="cx"> port:gmp \
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx">
</span><span class="cx"> destroot.args-append OVERRIDE_libdir=${sub_prefix}/lib
</span><span class="cx"> }
</span><del>-} elseif {${subport} == "clang-${llvm_version}"} {
</del><ins>+} elseif {${subport} eq "clang-${llvm_version}"} {
</ins><span class="cx"> variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
</span><span class="cx">
</span><span class="cx"> # The iOS SDK was shipped with all Xcode releases after 4.0
</span></span></pre>
</div>
</div>
</body>
</html>