<!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>[115647] trunk/dports/lang/apple-gcc42/Portfile</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/115647">115647</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-01-07 12:30:07 -0800 (Tue, 07 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>apple-gcc42: simplify port by removing unnecessary CPATH and LIBRARY_PATH environment variables and deduplicating other settings (#42048)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangapplegcc42Portfile">trunk/dports/lang/apple-gcc42/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangapplegcc42Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/apple-gcc42/Portfile (115646 => 115647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/apple-gcc42/Portfile        2014-01-07 20:24:13 UTC (rev 115646)
+++ trunk/dports/lang/apple-gcc42/Portfile        2014-01-07 20:30:07 UTC (rev 115647)
</span><span class="lines">@@ -71,10 +71,7 @@
</span><span class="cx"> #+  --with-mpfr=$DEST_ROOT \
</span><span class="cx"> #depends_lib             port:gmp port:mpfr
</span><span class="cx"> 
</span><del>-#depends_lib             port:libiconv
-depends_lib             port:ld64 port:cctools
</del><span class="cx"> depends_run             port:gcc_select
</span><del>-depends_skip_archcheck  ld64 cctools
</del><span class="cx"> 
</span><span class="cx"> use_configure no
</span><span class="cx"> variant universal {}
</span><span class="lines">@@ -166,25 +163,31 @@
</span><span class="cx"> compiler.cpath /usr/include
</span><span class="cx"> compiler.library_path /usr/lib
</span><span class="cx"> 
</span><del>-# TODO: Better use of MacPorts dependencies
</del><span class="cx"> build.env \
</span><del>-    LIBRARY_PATH=&quot;/usr/lib&quot; \
-    CPATH=&quot;/usr/include&quot; \
</del><span class="cx">     PATH=&quot;/bin:/usr/bin:/sbin:/usr/sbin&quot; \
</span><del>-    LANGUAGES=&quot;c,c++,objc,obj-c++&quot; \
-    AR_FOR_TARGET=${prefix}/bin/ar \
-    AS_FOR_TARGET=${prefix}/bin/as \
-    LD_FOR_TARGET=${prefix}/bin/ld \
-    NM_FOR_TARGET=${prefix}/bin/nm \
-    OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
-    RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
-    STRIP_FOR_TARGET=${prefix}/bin/strip \
-    DSYMUTIL_FOR_HOST=${prefix}/bin/dsymutil \
-    RANLIB_FOR_HOST=${prefix}/bin/ranlib \
-    STRIP_FOR_HOST=${prefix}/bin/strip \
-    OTOOL=${prefix}/bin/otool \
-    OTOOL64=${prefix}/bin/otool
</del><ins>+    LANGUAGES=&quot;c,c++,objc,obj-c++&quot;
</ins><span class="cx"> 
</span><ins>+if {![variant_isset bootstrap]} {
+    #depends_lib-append              port:libiconv
+    depends_lib-append              port:ld64 port:cctools
+    depends_skip_archcheck-append   ld64 cctools
+    
+    # TODO: Better use of MacPorts dependencies
+    build.env-append \
+        AR_FOR_TARGET=${prefix}/bin/ar \
+        AS_FOR_TARGET=${prefix}/bin/as \
+        LD_FOR_TARGET=${prefix}/bin/ld \
+        NM_FOR_TARGET=${prefix}/bin/nm \
+        OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+        RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+        STRIP_FOR_TARGET=${prefix}/bin/strip \
+        DSYMUTIL_FOR_HOST=${prefix}/bin/dsymutil \
+        RANLIB_FOR_HOST=${prefix}/bin/ranlib \
+        STRIP_FOR_HOST=${prefix}/bin/strip \
+        OTOOL=${prefix}/bin/otool \
+        OTOOL64=${prefix}/bin/otool
+}
+
</ins><span class="cx"> build.args-append \
</span><span class="cx">     CC=&quot;${configure.cc} -pipe -std=gnu89&quot; \
</span><span class="cx">     PREFIX=&quot;${prefix}&quot; \
</span><span class="lines">@@ -200,15 +203,6 @@
</span><span class="cx"> 
</span><span class="cx"> # On Tiger, we need apple-gcc42 to build llvm, which is needed for cctools
</span><span class="cx"> variant bootstrap description {Variant to break a dependency cycle on Tiger by first building an apple-gcc42 using host ld and cctools} {
</span><del>-#    depends_lib-delete      port:libiconv
-    depends_lib-delete      port:ld64 port:cctools
-
-    build.env \
-        LIBRARY_PATH=&quot;/usr/lib&quot; \
-        CPATH=&quot;/usr/include&quot; \
-        PATH=&quot;/bin:/usr/bin:/sbin:/usr/sbin&quot; \
-        LANGUAGES=&quot;c,c++,objc,obj-c++&quot;
-
</del><span class="cx">     pre-fetch {
</span><span class="cx">         if {([file exists ${prefix}/bin/ld] &amp;&amp; [file exists ${prefix}/bin/as]) || ${os.major} &gt; 8} {
</span><span class="cx">             ui_error &quot;Please install this port without the bootstrap variant.&quot;
</span></span></pre>
</div>
</div>

</body>
</html>