<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/783216ed1e2475122420d02726c47da27f46292b">https://github.com/macports/macports-ports/commit/783216ed1e2475122420d02726c47da27f46292b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 783216e gcc5: work around a bug in Apple's header on 10.13
</span>783216e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 783216ed1e2475122420d02726c47da27f46292b
</span>Author: kencu <ken.cunningham.webuse@gmail.com>
AuthorDate: Fri May 18 08:38:15 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gcc5: work around a bug in Apple's header on 10.13
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/56502
</span>---
lang/gcc5/Portfile | 3 +
lang/gcc5/files/headers-10.13-fix.patch | 127 ++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc5/Portfile b/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c011acb..6cf968f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +69,9 @@ patchfiles-append notparallel-install-headers.patch
</span> # Provide linkage for MacPorts libiconv in gcj
patchfiles-append gcj-libiconv-linkage.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# work around bug in 10.13 headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append headers-10.13-fix.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set major [lindex [split ${version} .-] 0]
post-extract {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc5/files/headers-10.13-fix.patch b/lang/gcc5/files/headers-10.13-fix.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..257494c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc5/files/headers-10.13-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,127 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -pur fixincludes/fixincl.x gcc-5.5.0/fixincludes/fixincl.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fixincludes/fixincl.x 2017-01-30 17:08:42.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/fixincl.x 2017-12-21 14:34:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,12 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -*- buffer-read-only: t -*- vi: set ro:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * DO NOT EDIT THIS FILE (fixincl.x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * It has been AutoGen-ed January 5, 2017 at 06:05:06 PM by AutoGen 5.16.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * It has been AutoGen-ed December 21, 2017 at 02:34:35 PM by AutoGen 5.18.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * From the definitions inclhack.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * and the template file fixincl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Jan 5 18:05:06 CET 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Dec 21 14:34:35 CET 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * You must regenerate it. Use the ./genfixes script.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * certain ANSI-incompatible system header files which are fixed to work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * correctly with ANSI C and placed in a directory that GNU C will search.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * This file contains 240 fixup descriptions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This file contains 241 fixup descriptions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * See README for more information.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2579,6 +2579,43 @@ extern \"C\" {\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* * * * * * * * * * * * * * * * * * * * * * * * * *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Description of Darwin_Osavailability fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tSCC zDarwin_OsavailabilityName[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "darwin_osavailability";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * File name selection pattern
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tSCC zDarwin_OsavailabilityList[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "os/availability.h\0";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Machine/OS name selection pattern
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tSCC* apzDarwin_OsavailabilityMachs[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "*-*-darwin*",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (const char*)NULL };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * content selection pattern - do fix if pattern found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tSCC zDarwin_OsavailabilitySelect0[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "#define[ \t]+__(API_[A-Z_]*)\\(\\.\\.\\.\\)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define DARWIN_OSAVAILABILITY_TEST_CT 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static tTestDesc aDarwin_OsavailabilityTests[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { TT_EGREP, zDarwin_OsavailabilitySelect0, (regex_t*)NULL }, };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Fix Command Arguments for Darwin_Osavailability
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const char* apzDarwin_OsavailabilityPatch[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "format",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "#define %1(...)",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (char*)NULL };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* * * * * * * * * * * * * * * * * * * * * * * * * *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Description of Darwin_9_Long_Double_Funcs_2 fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tSCC zDarwin_9_Long_Double_Funcs_2Name[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9818,9 +9855,9 @@ static const char* apzX11_SprintfPatch[]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * List of all fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define REGEX_COUNT 276
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define REGEX_COUNT 277
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MACH_LIST_SIZE_LIMIT 187
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define FIX_COUNT 240
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FIX_COUNT 241
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Enumerate the fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9885,6 +9922,7 @@ typedef enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTRL_QUOTES_DEF_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTRL_QUOTES_USE_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX_UNREADY_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DARWIN_OSAVAILABILITY_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DARWIN_EXTERNC_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DARWIN_GCC4_BREAKAGE_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10364,6 +10402,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aCxx_UnreadyTests, apzCxx_UnreadyPatch, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { zDarwin_OsavailabilityName, zDarwin_OsavailabilityList,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ apzDarwin_OsavailabilityMachs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DARWIN_OSAVAILABILITY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ aDarwin_OsavailabilityTests, apzDarwin_OsavailabilityPatch, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { zDarwin_9_Long_Double_Funcs_2Name, zDarwin_9_Long_Double_Funcs_2List,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apzDarwin_9_Long_Double_Funcs_2Machs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -pur fixincludes/inclhack.def gcc-5.5.0/fixincludes/inclhack.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fixincludes/inclhack.def 2017-01-30 17:08:42.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/inclhack.def 2017-12-21 14:34:28.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1337,6 +1337,18 @@ fix = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test_text = "extern void* malloc( size_t );";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fix = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hackname = darwin_osavailability;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach = "*-*-darwin*";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ files = os/availability.h;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ select = "#define[ \t]+__(API_[A-Z_]*)\\(\\.\\.\\.\\)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c_fix = format;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c_fix_arg = "#define %1(...)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test_text = "#define __API_AVAILABLE(...)\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "#define API_AVAILABLE(...)\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * For the AAB_darwin7_9_long_double_funcs fix to be useful,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * you have to not use "" includes.
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>