<!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>[122725] trunk/dports/lang/apple-gcc42</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/122725">122725</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-07-27 17:19:29 -0700 (Sun, 27 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>apple-gcc42: Fix support for Yosemite deployment target</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangapplegcc42Portfile">trunk/dports/lang/apple-gcc42/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangapplegcc42filesyosemitedeploymenttargetpatch">trunk/dports/lang/apple-gcc42/files/yosemite-deployment-target.patch</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 (122724 => 122725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/apple-gcc42/Portfile 2014-07-27 21:17:57 UTC (rev 122724)
+++ trunk/dports/lang/apple-gcc42/Portfile 2014-07-28 00:19:29 UTC (rev 122725)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> name apple-gcc42
</span><span class="cx"> version 5666.3
</span><span class="cx"> set gcc_version 4.2.1
</span><del>-revision 13
</del><ins>+revision 14
</ins><span class="cx"> categories lang
</span><span class="cx"> platforms darwin
</span><span class="cx"> license {GPL-2+ Permissive}
</span><span class="lines">@@ -101,13 +101,15 @@
</span><span class="cx"> set objroot ${workpath}/objroot
</span><span class="cx"> set symroot ${workpath}/symroot
</span><span class="cx">
</span><del>-# werror-*.patch : Fix compilation errors when building for x86_64
-# incpath.patch : Don't prepend the -isysroot option argument to the compiler's own search paths
-# driverdriver-num_infiles.patch : Fix linking with no input files (ie all static archives passed with -l...)
-# driverdriver-armcheck.patch : Build fix for the driverdriver when arm support is not available (eg: Tiger)
-# tiger-Unwind_GetIPInfo.patch : https://trac.macports.org/ticket/36226
</del><ins>+# werror-*.patch : Fix compilation errors when building for x86_64
+# incpath.patch : Don't prepend the -isysroot option argument to the compiler's own search paths
+# driverdriver-num_infiles.patch : Fix linking with no input files (ie all static archives passed with -l...)
+# driverdriver-armcheck.patch : Build fix for the driverdriver when arm support is not available (eg: Tiger)
+# tiger-Unwind_GetIPInfo.patch : https://trac.macports.org/ticket/36226
+# yosemite-deployment-target.patch : https://trac.macports.org/ticket/43978
</ins><span class="cx">
</span><span class="cx"> patchfiles-append \
</span><ins>+ yosemite-deployment-target.patch \
</ins><span class="cx"> werror-c-incpath.patch \
</span><span class="cx"> werror-local-alloc.patch \
</span><span class="cx"> incpath.patch \
</span></span></pre></div>
<a id="trunkdportslangapplegcc42filesyosemitedeploymenttargetpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/apple-gcc42/files/yosemite-deployment-target.patch (0 => 122725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/apple-gcc42/files/yosemite-deployment-target.patch (rev 0)
+++ trunk/dports/lang/apple-gcc42/files/yosemite-deployment-target.patch 2014-07-28 00:19:29 UTC (rev 122725)
</span><span class="lines">@@ -0,0 +1,110 @@
</span><ins>+--- gcc/config/darwin-c.c.orig 2010-10-14 13:27:53.000000000 -0700
++++ gcc/config/darwin-c.c 2014-07-27 16:06:45.000000000 -0700
+@@ -933,24 +933,24 @@ find_subframework_header (cpp_reader *pf
+ Print a warning if the version number is not known. */
+ static const char *
+ /* APPLE LOCAL ARM 5683689 */
+-macosx_version_as_macro (void)
++legacy_version_as_macro (const char *version_str)
+ {
+ static char result[] = "1000";
+
+- if (strncmp (darwin_macosx_version_min, "10.", 3) != 0)
++ if (strncmp (version_str, "10.", 3) != 0)
+ goto fail;
+- if (! ISDIGIT (darwin_macosx_version_min[3]))
++ if (! ISDIGIT (version_str[3]))
+ goto fail;
+- result[2] = darwin_macosx_version_min[3];
+- if (darwin_macosx_version_min[4] != '\0')
++ result[2] = version_str[3];
++ if (version_str[4] != '\0')
+ {
+- if (darwin_macosx_version_min[4] != '.')
++ if (version_str[4] != '.')
+ goto fail;
+- if (! ISDIGIT (darwin_macosx_version_min[5]))
++ if (! ISDIGIT (version_str[5]))
+ goto fail;
+- if (darwin_macosx_version_min[6] != '\0')
++ if (version_str[6] != '\0')
+ goto fail;
+- result[3] = darwin_macosx_version_min[5];
++ result[3] = version_str[5];
+ }
+ else
+ result[3] = '0';
+@@ -958,9 +958,7 @@ macosx_version_as_macro (void)
+ return result;
+
+ fail:
+- error ("Unknown value %qs of -mmacosx-version-min",
+- darwin_macosx_version_min);
+- return "1000";
++ return NULL;
+ }
+
+ /* APPLE LOCAL begin ARM 5683689 */
+@@ -972,13 +970,13 @@ macosx_version_as_macro (void)
+ defaults to '00' if not specified. In the case of a parse error,
+ print a warning and return 10200. */
+ static const char *
+-iphoneos_version_as_macro (void)
++modern_version_as_macro (const char *version_str)
+ {
+ static char result[sizeof ("99.99.99") + 1];
+- const char *src_ptr = darwin_iphoneos_version_min;
++ const char *src_ptr = version_str;
+ char *result_ptr = &result[0];
+
+- if (! darwin_iphoneos_version_min)
++ if (! version_str)
+ goto fail;
+
+ if (! ISDIGIT (*src_ptr))
+@@ -1032,10 +1030,42 @@ iphoneos_version_as_macro (void)
+ return result;
+
+ fail:
+- error ("Unknown value %qs of -miphoneos-version-min",
+- darwin_iphoneos_version_min);
+- return "10200";
++ return NULL;
++}
++
++static const char *
++iphoneos_version_as_macro (void)
++{
++ static const char *result;
++ result = modern_version_as_macro(darwin_iphoneos_version_min);
++
++ if (!result) {
++ error ("Unknown value %qs of -miphoneos-version-min",
++ darwin_iphoneos_version_min);
++ return "10200";
++ }
++
++ return result;
+ }
++
++static const char *
++macosx_version_as_macro (void)
++{
++ static const char *result;
++ result = legacy_version_as_macro(darwin_macosx_version_min);
++
++ if (!result)
++ result = modern_version_as_macro(darwin_macosx_version_min);
++
++ if (!result) {
++ error ("Unknown value %qs of -mmacosx-version-min",
++ darwin_macosx_version_min);
++ return "1000";
++ }
++
++ return result;
++}
++
+ /* APPLE LOCAL end ARM 5683689 */
+
+ /* Define additional CPP flags for Darwin. */
</ins></span></pre>
</div>
</div>
</body>
</html>