<!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>[128478] trunk/dports/lang/gcc44</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/128478">128478</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2014-11-21 18:18:18 -0800 (Fri, 21 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gcc44: Fix handling of OS X deployment targets
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810, and also
comment:9:ticket:45449, comment:61:ticket:43978, and
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61407#c49.
Allows installation on Yosemite and later (#43978).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslanggcc44Portfile">trunk/dports/lang/gcc44/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslanggcc44filesmacosxversionminpatch">trunk/dports/lang/gcc44/files/macosx-version-min.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslanggcc44Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc44/Portfile (128477 => 128478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc44/Portfile 2014-11-22 02:14:10 UTC (rev 128477)
+++ trunk/dports/lang/gcc44/Portfile 2014-11-22 02:18:18 UTC (rev 128478)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> name gcc44
</span><span class="cx"> epoch 1
</span><span class="cx"> version 4.4.7
</span><del>-revision 8
</del><ins>+revision 9
</ins><span class="cx"> platforms darwin
</span><span class="cx"> categories lang
</span><span class="cx"> maintainers mww openmaintainer
</span><span class="lines">@@ -64,6 +64,10 @@
</span><span class="cx"> patchfiles ppc_fde_encoding.diff \
</span><span class="cx"> texinfo5.patch
</span><span class="cx">
</span><ins>+# Handle OS X deployment targets correctly (GCC PR target/63810
+# <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810>).
+patchfiles-append macosx-version-min.patch
+
</ins><span class="cx"> # Don't link with "-flat_namespace -undefined suppress" on Yosemite and
</span><span class="cx"> # later (#45483).
</span><span class="cx"> patchfiles-append yosemite-libtool.patch
</span></span></pre></div>
<a id="trunkdportslanggcc44filesmacosxversionminpatchfromrev128470trunkdportslanggcc45filesmacosxversionminpatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/gcc44/files/macosx-version-min.patch (from rev 128470, trunk/dports/lang/gcc45/files/macosx-version-min.patch) (0 => 128478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc44/files/macosx-version-min.patch (rev 0)
+++ trunk/dports/lang/gcc44/files/macosx-version-min.patch 2014-11-22 02:18:18 UTC (rev 128478)
</span><span class="lines">@@ -0,0 +1,221 @@
</span><ins>+Index: gcc/config/darwin-c.c
+===================================================================
+--- gcc/config/darwin-c.c.orig
++++ gcc/config/darwin-c.c
+@@ -565,29 +565,180 @@ find_subframework_header (cpp_reader *pf
+ return 0;
+ }
+
+-/* Return the value of darwin_macosx_version_min suitable for the
+- __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro,
+- so '10.4.2' becomes 1040. The lowest digit is always zero.
+- Print a warning if the version number can't be understood. */
++/* Given a version string, return the version as a statically-allocated
++ array of three non-negative integers. If the version string is
++ invalid, return null.
++
++ Version strings must consist of one, two, or three tokens, each
++ separated by a single period. Each token must contain only the
++ characters '0' through '9' and is converted to an equivalent
++ integer. Omitted tokens are treated as zeros. For example:
++
++ "10" becomes {10,0,0}
++ "10.10" becomes {10,10,0}
++ "10.10.1" becomes {10,10,1}
++ "10.000010.1" becomes {10,10,1}
++ "10.010.001" becomes {10,10,1}
++ "000010.10.00001" becomes {10,10,1} */
++
++enum version_components { MAJOR, MINOR, TINY };
++
++static const unsigned long *
++parse_version (const char *version_str)
++{
++ size_t version_len;
++ char *end;
++ static unsigned long version_array[3];
++
++ if (! version_str)
++ return NULL;
++
++ version_len = strlen (version_str);
++ if (version_len < 1)
++ return NULL;
++
++ /* Version string must consist of digits and periods only. */
++ if (strspn (version_str, "0123456789.") != version_len)
++ return NULL;
++
++ if (! ISDIGIT (version_str[0]) || ! ISDIGIT (version_str[version_len - 1]))
++ return NULL;
++
++ version_array[MAJOR] = strtoul (version_str, &end, 10);
++ version_str = end + ((*end == '.') ? 1 : 0);
++
++ /* Version string must not contain adjacent periods. */
++ if (*version_str == '.')
++ return NULL;
++
++ version_array[MINOR] = strtoul (version_str, &end, 10);
++ version_str = end + ((*end == '.') ? 1 : 0);
++
++ version_array[TINY] = strtoul (version_str, &end, 10);
++
++ /* Version string must contain no more than three tokens. */
++ if (*end != '\0')
++ return NULL;
++
++ return version_array;
++}
++
++/* Given a three-component version represented as an array of
++ non-negative integers, return a statically-allocated string suitable
++ for the legacy __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro.
++ If the version is invalid and cannot be coerced into a valid form,
++ return null.
++
++ The legacy format is a four-character string -- two chars for the
++ major number and one each for the minor and tiny numbers. Major
++ numbers are zero-padded if necessary. Minor and tiny numbers from
++ 10 through 99 are permitted but are clamped to 9 (for example,
++ {10,9,10} produces "1099"). Versions containing numbers greater
++ than 99 are rejected. */
++
++static const char *
++version_as_legacy_macro (const unsigned long *version)
++{
++ unsigned long major, minor, tiny;
++ static char result[sizeof "9999"];
++
++ if (! version)
++ return NULL;
++
++ major = version[MAJOR];
++ minor = version[MINOR];
++ tiny = version[TINY];
++
++ if (major > 99 || minor > 99 || tiny > 99)
++ return NULL;
++
++ minor = ((minor > 9) ? 9 : minor);
++ tiny = ((tiny > 9) ? 9 : tiny);
++
++ /* NOTE: Cast result of sizeof so that result of sprintf is not
++ converted to an unsigned type. */
++ if (sprintf (result, "%02lu%lu%lu", major, minor, tiny)
++ != (int) sizeof "9999" - 1)
++ return NULL;
++
++ return result;
++}
++
++/* Given a three-component version represented as an array of
++ non-negative integers, return a statically-allocated string suitable
++ for the modern __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro
++ or the __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ macro. If the
++ version is invalid, return null.
++
++ The modern format is a five- or six-character string -- one or two
++ chars for the major number and two each for the minor and tiny
++ numbers, which are zero-padded if necessary (for example, {8,1,0}
++ produces "80100", and {10,10,1} produces "101001"). Versions
++ containing numbers greater than 99 are rejected. */
++
+ static const char *
+-version_as_macro (void)
++version_as_modern_macro (const unsigned long *version)
+ {
+- static char result[] = "1000";
++ unsigned long major, minor, tiny;
++ static char result[sizeof "999999"];
++
++ if (! version)
++ return NULL;
++
++ major = version[MAJOR];
++ minor = version[MINOR];
++ tiny = version[TINY];
++
++ if (major > 99 || minor > 99 || tiny > 99)
++ return NULL;
++
++ /* NOTE: 'sizeof ((x > y) ? "foo" : "bar")' returns size of char
++ pointer instead of char array, so use
++ '(x > y) ? sizeof "foo" : sizeof "bar"' instead. */
++ /* NOTE: Cast result of sizeof so that result of sprintf is not
++ converted to an unsigned type. */
++ if (sprintf (result, "%lu%02lu%02lu", major, minor, tiny)
++ != (int) ((major > 9) ? sizeof "999999" : sizeof "99999") - 1)
++ return NULL;
+
+- if (strncmp (darwin_macosx_version_min, "10.", 3) != 0)
++ return result;
++}
++
++/* Return the value of darwin_macosx_version_min, suitably formatted
++ for the __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro. Values
++ representing OS X 10.9 and earlier are encoded using the legacy
++ four-character format, while 10.10 and later use a modern
++ six-character format. (For example, "10.9" produces "1090", and
++ "10.10.1" produces "101001".) If the value is invalid and cannot be
++ coerced into a valid form, print a warning and return "1000". */
++
++static const char *
++macosx_version_as_macro (void)
++{
++ const unsigned long *version_array;
++ const char *version_macro;
++
++ version_array = parse_version (darwin_macosx_version_min);
++ if (! version_array)
+ goto fail;
+- if (! ISDIGIT (darwin_macosx_version_min[3]))
++
++ /* Do not assume that the major number will always be exactly 10. */
++ if (version_array[MAJOR] < 10 || version_array[MAJOR] > 10)
+ goto fail;
+- result[2] = darwin_macosx_version_min[3];
+- if (darwin_macosx_version_min[4] != '\0'
+- && darwin_macosx_version_min[4] != '.')
++
++ if (version_array[MAJOR] == 10 && version_array[MINOR] < 10)
++ version_macro = version_as_legacy_macro (version_array);
++ else
++ version_macro = version_as_modern_macro (version_array);
++
++ if (! version_macro)
+ goto fail;
+
+- return result;
++ return version_macro;
+
+ fail:
+- error ("Unknown value %qs of -mmacosx-version-min",
+- darwin_macosx_version_min);
++ error ("unknown value %qs of -mmacosx-version-min",
++ darwin_macosx_version_min);
+ return "1000";
+ }
+
+@@ -606,7 +757,7 @@ darwin_cpp_builtins (cpp_reader *pfile)
+ builtin_define_with_value ("__APPLE_CC__", "1", false);
+
+ builtin_define_with_value ("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__",
+- version_as_macro(), false);
++ macosx_version_as_macro(), false);
+ }
+
+ /* Handle C family front-end options. */
+Index: gcc/config/darwin-driver.c
+===================================================================
+--- gcc/config/darwin-driver.c.orig
++++ gcc/config/darwin-driver.c
+@@ -120,8 +120,6 @@ darwin_default_min_version (int * argc_p
+ version_p = osversion + 1;
+ if (ISDIGIT (*version_p))
+ major_vers = major_vers * 10 + (*version_p++ - '0');
+- if (major_vers > 4 + 9)
+- goto parse_failed;
+ if (*version_p++ != '.')
+ goto parse_failed;
+ version_pend = strchr(version_p, '.');
</ins></span></pre>
</div>
</div>
</body>
</html>