<!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>[136994] trunk/dports/lang/gcc6</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/136994">136994</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-06-01 21:25:29 -0700 (Mon, 01 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gcc6: update to 6-20150531; remove patch integrated upstream</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslanggcc6Portfile">trunk/dports/lang/gcc6/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslanggcc6filesmacosxversionminpatch">trunk/dports/lang/gcc6/files/macosx-version-min.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslanggcc6Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc6/Portfile (136993 => 136994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc6/Portfile 2015-06-02 00:32:37 UTC (rev 136993)
+++ trunk/dports/lang/gcc6/Portfile 2015-06-02 04:25:29 UTC (rev 136994)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> subport libgcc-devel {}
</span><span class="cx">
</span><span class="cx"> epoch 1
</span><del>-version 6-20150524
</del><ins>+version 6-20150531
</ins><span class="cx"> platforms darwin
</span><span class="cx"> categories lang
</span><span class="cx"> maintainers mww openmaintainer
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> distname gcc-${version}
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 5c7c77bbbaca8e1827037f28bbff3c8b9bd2b149 \
- sha256 347258c6f1205f5095218a95b727653e76e1317daa21bb2b25035eedfd89416b
</del><ins>+checksums rmd160 9968c0d7e74b1311bf41326cd87152643fcdc388 \
+ sha256 4afb6698b71cad8ca8c2cb1e99ab5c9153994ee5029abeec3473de16e6c3ff89
</ins><span class="cx">
</span><span class="cx"> depends_lib port:cctools \
</span><span class="cx"> port:gmp \
</span><span class="lines">@@ -47,10 +47,6 @@
</span><span class="cx"> depends_skip_archcheck-append gcc_select ld64 cctools
</span><span class="cx"> license_noconflict gmp mpfr ppl libmpc
</span><span class="cx">
</span><del>-# 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
-
</del><span class="cx"> set major [lindex [split ${version} .-] 0]
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span></span></pre></div>
<a id="trunkdportslanggcc6filesmacosxversionminpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/gcc6/files/macosx-version-min.patch (136993 => 136994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc6/files/macosx-version-min.patch 2015-06-02 00:32:37 UTC (rev 136993)
+++ trunk/dports/lang/gcc6/files/macosx-version-min.patch 2015-06-02 04:25:29 UTC (rev 136994)
</span><span class="lines">@@ -1,419 +0,0 @@
</span><del>-Index: gcc/config/darwin-c.c
-===================================================================
---- gcc/config/darwin-c.c.orig
-+++ gcc/config/darwin-c.c
-@@ -570,42 +570,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 and '10.10.0' becomes 101000. The lowest digit is
-- always zero, as is the second lowest for '10.10.x' and above.
-- 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_macro (void)
-+version_as_legacy_macro (const unsigned long *version)
- {
-- static char result[7] = "1000";
-- int minorDigitIdx;
-+ 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;
-
-- if (strncmp (darwin_macosx_version_min, "10.", 3) != 0)
-+ 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_modern_macro (const unsigned long *version)
-+{
-+ 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;
-+
-+ 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;
-
-- minorDigitIdx = 3;
-- result[2] = darwin_macosx_version_min[minorDigitIdx++];
-- if (ISDIGIT (darwin_macosx_version_min[minorDigitIdx]))
-- {
-- /* Starting with OS X 10.10, the macro ends '00' rather than '0',
-- i.e. 10.10.x becomes 101000 rather than 10100. */
-- result[3] = darwin_macosx_version_min[minorDigitIdx++];
-- result[4] = '0';
-- result[5] = '0';
-- result[6] = '\0';
-- }
-- if (darwin_macosx_version_min[minorDigitIdx] != '\0'
-- && darwin_macosx_version_min[minorDigitIdx] != '.')
-+ 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);
-+ darwin_macosx_version_min);
- return "1000";
- }
-
-@@ -627,7 +765,7 @@ darwin_cpp_builtins (cpp_reader *pfile)
- builtin_define ("__CONSTANT_CFSTRINGS__");
-
- builtin_define_with_value ("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__",
-- version_as_macro(), false);
-+ macosx_version_as_macro(), false);
-
- /* Since we do not (at 4.6) support ObjC gc for the NeXT runtime, the
- following will cause a syntax error if one tries to compile gc attributed
-Index: gcc/testsuite/gcc.dg/darwin-minversion-10.c
-===================================================================
---- /dev/null
-+++ gcc/testsuite/gcc.dg/darwin-minversion-10.c
-@@ -0,0 +1,16 @@
-+/* PR target/63810: Test that a version with a zero-padded minor
-+ number < 10 and a zero-padded tiny number < 10 produces the correct
-+ four-character macro. */
-+/* Added by Lawrence Velázquez <larryv@macports.org>. */
-+
-+/* { dg-options "-mmacosx-version-min=10.07.02" } */
-+/* { dg-do compile { target *-*-darwin* } } */
-+
-+int
-+main ()
-+{
-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1072
-+ fail me;
-+#endif
-+ return 0;
-+}
-Index: gcc/testsuite/gcc.dg/darwin-minversion-11.c
-===================================================================
---- /dev/null
-+++ gcc/testsuite/gcc.dg/darwin-minversion-11.c
-@@ -0,0 +1,15 @@
-+/* PR target/63810: Test that a version with outrageous zero-padding and
-+ a minor number > 9 still produces a six-character macro. */
-+/* Added by Lawrence Velázquez <larryv@macports.org>. */
-+
-+/* { dg-options "-mmacosx-version-min=00010.010.0000098" } */
-+/* { dg-do compile { target *-*-darwin* } } */
-+
-+int
-+main ()
-+{
-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101098
-+ fail me;
-+#endif
-+ return 0;
-+}
-Index: gcc/testsuite/gcc.dg/darwin-minversion-12.c
-===================================================================
---- /dev/null
-+++ gcc/testsuite/gcc.dg/darwin-minversion-12.c
-@@ -0,0 +1,15 @@
-+/* PR target/63810: Test that a version with outrageous zero-padding and
-+ a minor number < 10 still produces a four-character macro. */
-+/* Added by Lawrence Velázquez <larryv@macports.org>. */
-+
-+/* { dg-options "-mmacosx-version-min=010.008.000031" } */
-+/* { dg-do compile { target *-*-darwin* } } */
-+
-+int
-+main ()
-+{
-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1089
-+ fail me;
-+#endif
-+ return 0;
-+}
-Index: gcc/testsuite/gcc.dg/darwin-minversion-3.c
-===================================================================
---- gcc/testsuite/gcc.dg/darwin-minversion-3.c.orig
-+++ gcc/testsuite/gcc.dg/darwin-minversion-3.c
-@@ -1,11 +1,11 @@
--/* Test that most-minor versions greater than 9 work. */
--/* { dg-options "-mmacosx-version-min=10.4.10" } */
-+/* Test that most minor versions < 10 work. */
-+/* { dg-options "-mmacosx-version-min=10.4.1" } */
- /* { dg-do compile { target *-*-darwin* } } */
-
- int
- main ()
- {
--#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1040
-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1041
- fail me;
- #endif
- return 0;
-Index: gcc/testsuite/gcc.dg/darwin-minversion-4.c
-===================================================================
---- gcc/testsuite/gcc.dg/darwin-minversion-4.c.orig
-+++ gcc/testsuite/gcc.dg/darwin-minversion-4.c
-@@ -1,11 +1,11 @@
--/* Test that major versions greater than 9 work and have the additional 0. */
--/* { dg-options "-mmacosx-version-min=10.10.0" } */
-+/* Test that minor versions > 9 produce a six-character macro. */
-+/* { dg-options "-mmacosx-version-min=10.10.1" } */
- /* { dg-do compile { target *-*-darwin* } } */
-
- int
- main ()
- {
--#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101000
-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101001
- fail me;
- #endif
- return 0;
-Index: gcc/testsuite/gcc.dg/darwin-minversion-5.c
-===================================================================
---- /dev/null
-+++ gcc/testsuite/gcc.dg/darwin-minversion-5.c
-@@ -0,0 +1,16 @@
-+/* PR target/63810: Test that a version with minor number < 10 and tiny
-+ number > 9 produces a four-character macro with the tiny number
-+ clamped to 9. */
-+/* Added by Lawrence Velázquez <larryv@macports.org>. */
-+
-+/* { dg-options "-mmacosx-version-min=10.9.10" } */
-+/* { dg-do compile { target *-*-darwin* } } */
-+
-+int
-+main ()
-+{
-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1099
-+ fail me;
-+#endif
-+ return 0;
-+}
-Index: gcc/testsuite/gcc.dg/darwin-minversion-6.c
-===================================================================
---- /dev/null
-+++ gcc/testsuite/gcc.dg/darwin-minversion-6.c
-@@ -0,0 +1,15 @@
-+/* PR target/63810: Test that tiny numbers are preserved in
-+ six-character macros. */
-+/* Added by Lawrence Velázquez <larryv@macports.org>. */
-+
-+/* { dg-options "-mmacosx-version-min=10.10.11" } */
-+/* { dg-do compile { target *-*-darwin* } } */
-+
-+int
-+main ()
-+{
-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101011
-+ fail me;
-+#endif
-+ return 0;
-+}
-Index: gcc/testsuite/gcc.dg/darwin-minversion-7.c
-===================================================================
---- /dev/null
-+++ gcc/testsuite/gcc.dg/darwin-minversion-7.c
-@@ -0,0 +1,15 @@
-+/* PR target/63810: Test that tiny numbers < 10 are preserved in
-+ four-character macros. */
-+/* Added by Lawrence Velázquez <larryv@macports.org>. */
-+
-+/* { dg-options "-mmacosx-version-min=10.9.1" } */
-+/* { dg-do compile { target *-*-darwin* } } */
-+
-+int
-+main ()
-+{
-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1091
-+ fail me;
-+#endif
-+ return 0;
-+}
-Index: gcc/testsuite/gcc.dg/darwin-minversion-8.c
-===================================================================
---- /dev/null
-+++ gcc/testsuite/gcc.dg/darwin-minversion-8.c
-@@ -0,0 +1,15 @@
-+/* PR target/63810: Test that a version with minor number > 9 and no
-+ tiny number produces a six-character macro ending in "00". */
-+/* Added by Lawrence Velázquez <larryv@macports.org>. */
-+
-+/* { dg-options "-mmacosx-version-min=10.11" } */
-+/* { dg-do compile { target *-*-darwin* } } */
-+
-+int
-+main ()
-+{
-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 101100
-+ fail me;
-+#endif
-+ return 0;
-+}
-Index: gcc/testsuite/gcc.dg/darwin-minversion-9.c
-===================================================================
---- /dev/null
-+++ gcc/testsuite/gcc.dg/darwin-minversion-9.c
-@@ -0,0 +1,15 @@
-+/* PR target/63810: Test that a version with a zero-padded minor
-+ number < 10 produces a four-character macro. */
-+/* Added by Lawrence Velázquez <larryv@macports.org>. */
-+
-+/* { dg-options "-mmacosx-version-min=10.08.4" } */
-+/* { dg-do compile { target *-*-darwin* } } */
-+
-+int
-+main ()
-+{
-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1084
-+ fail me;
-+#endif
-+ return 0;
-+}
</del></span></pre>
</div>
</div>
</body>
</html>