<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/70cd823d8373d730df327781959662926d2445c0">https://github.com/macports/macports-ports/commit/70cd823d8373d730df327781959662926d2445c0</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 70cd823 gcc7,libgcc7: Add upstream patch to fix builds on macOS10.14
</span>70cd823 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 70cd823d8373d730df327781959662926d2445c0
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu May 2 13:41:32 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> gcc7,libgcc7: Add upstream patch to fix builds on macOS10.14
</span>---
lang/gcc7/Portfile | 18 ++++
lang/gcc7/files/xcode-bug-_Atomic-fix.patch | 138 ++++++++++++++++++++++++++++
2 files changed, 156 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc7/Portfile b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd12e61..25bc91b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,6 +3,7 @@
</span> PortSystem 1.0
PortGroup select 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcodeversion 1.0
</span>
name gcc7
epoch 3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +63,15 @@ license_noconflict gmp mpfr ppl libmpc
</span> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81797
patchfiles-append notparallel-install-headers.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${xcodeversion} 10.2] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/58260
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Patch for Xcode bug, taken from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89864#c43
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/Homebrew/homebrew-core/pull/39134/files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This should be removed in the next release of GCC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append xcode-bug-_Atomic-fix.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set major [lindex [split ${version} .-] 0]
platform darwin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,6 +150,14 @@ pre-configure {
</span> file mkdir ${configure.dir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gcc cannot build if libunwind-headers is active
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![catch {set vers [lindex [registry_active libunwind-headers] 0]}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} cannot be built whilst libunwind-headers is installed."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "build error"
</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> # http://trac.macports.org/ticket/29067
compiler.blacklist-append gcc-4.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc7/files/xcode-bug-_Atomic-fix.patch b/lang/gcc7/files/xcode-bug-_Atomic-fix.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..70f0459
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc7/files/xcode-bug-_Atomic-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,138 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ad5824d..e36abe8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fixincludes/fixincl.x.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/fixincl.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,11 +2,11 @@
</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 Saturday February 25, 2017 at 03:25:44 PM EST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * It has been AutoGen-ed April 16, 2019 at 09:32:25 AM by AutoGen 5.17.4
</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 Sat 25 Feb 2017 15:25:44 EST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Apr 16 09:32:25 IST 2019
</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 248 fixup descriptions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This file contains 249 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;'>+@@ -3262,6 +3262,48 @@
</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_Ucred__Atomic fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tSCC zDarwin_Ucred__AtomicName[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "darwin_ucred__Atomic";
</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_Ucred__AtomicList[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "sys/ucred.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_Ucred__AtomicMachs[] = {
</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_Ucred__AtomicSelect0[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "_Atomic";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define DARWIN_UCRED__ATOMIC_TEST_CT 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static tTestDesc aDarwin_Ucred__AtomicTests[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { TT_EGREP, zDarwin_Ucred__AtomicSelect0, (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_Ucred__Atomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const char* apzDarwin_Ucred__AtomicPatch[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "wrap",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define _Atomic volatile\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef _Atomic\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif\n",
</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 Dec_Intern_Asm fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tSCC zDec_Intern_AsmName[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10139,9 +10181,9 @@
</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 285
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define REGEX_COUNT 286
</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 248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FIX_COUNT 249
</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;'>+@@ -10222,6 +10264,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DARWIN_STDINT_5_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DARWIN_STDINT_6_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DARWIN_STDINT_7_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DARWIN_UCRED__ATOMIC_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEC_INTERN_ASM_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DJGPP_WCHAR_H_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ECD_CURSOR_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10773,6 +10816,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aDarwin_Stdint_7Tests, apzDarwin_Stdint_7Patch, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { zDarwin_Ucred__AtomicName, zDarwin_Ucred__AtomicList,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ apzDarwin_Ucred__AtomicMachs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { zDec_Intern_AsmName, zDec_Intern_AsmList,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apzDec_Intern_AsmMachs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8fd9f7e..98f1654 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fixincludes/inclhack.def.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/inclhack.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1688,6 +1688,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "#define UINTMAX_C(v) (v ## ULL)";
</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;'>++/* The SDK included with XCode 10.2 has the file <sys/ucred.h> that uses the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ C11 _Atomic keyword (exposing it to C++ code). The work-around here follows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ the header in declaring the entity volatile when _Atomic is not available.
</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_ucred__Atomic;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach = "*-*-darwin*";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ files = sys/ucred.h;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ select = "_Atomic";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c_fix = wrap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c_fix_arg = "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "# define _Atomic volatile\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "#endif\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c_fix_arg = "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "# undef _Atomic\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "#endif\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test_text = "_Atomic";
</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;'>+ * Fix <c_asm.h> on Digital UNIX V4.0:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * It contains a prototype for a DEC C internal asm() function,
</span></pre><pre style='margin:0'>
</pre>