<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/6263f398c14b9cdf76aedcb01b0aade3130c58b5">https://github.com/macports/macports-ports/commit/6263f398c14b9cdf76aedcb01b0aade3130c58b5</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 6263f39 gcc8,libgcc8: Add upstream patch to fix builds on macOS10.14
</span>6263f39 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6263f398c14b9cdf76aedcb01b0aade3130c58b5
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu May 2 13:09:07 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> gcc8,libgcc8: Add upstream patch to fix builds on macOS10.14
</span>---
lang/gcc8/Portfile | 18 +++++
lang/gcc8/files/xcode-bug-_Atomic-fix.patch | 104 ++++++++++++++++++++++++++++
2 files changed, 122 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc8/Portfile b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a85021e..36d46d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc8/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>
epoch 3
name gcc8
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +55,15 @@ platform darwin {
</span> configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
}
<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> configure.dir ${workpath}/build
configure.cmd ${worksrcpath}/configure
configure.args --enable-languages=c,c++,objc,obj-c++,lto,fortran \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,6 +155,14 @@ pre-fetch {
</span> }
}
<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> if {${subport} eq "libgcc8"} {
# Always provides primary runtime so always in conflict
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc8/files/xcode-bug-_Atomic-fix.patch b/lang/gcc8/files/xcode-bug-_Atomic-fix.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..767d9c3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc8/files/xcode-bug-_Atomic-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,104 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r -u gcc-8.3.0/fixincludes/fixincl.x gcc-8.3.0-patch/fixincludes/fixincl.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fixincludes/fixincl.x.orig 2018-02-23 01:12:26.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/fixincl.x 2019-04-11 12:37:25.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3222,6 +3222,44 @@
</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;'>++ "*-*-darwin18*",
</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;'>++ "# define _Atomic volatile\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "# undef _Atomic\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;'>+@@ -10099,9 +10137,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 287
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define REGEX_COUNT 288
</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 249
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FIX_COUNT 250
</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;'>+@@ -10183,6 +10221,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;'>+@@ -10739,6 +10778,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 -r -u gcc-8.3.0/fixincludes/inclhack.def gcc-8.3.0-patch/fixincludes/inclhack.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fixincludes/inclhack.def.orig 2018-02-23 01:12:26.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/inclhack.def 2019-04-11 12:37:59.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1592,6 +1592,19 @@
</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;'>++/* XCode 10.2 <sys/ucred.h> uses the C _Atomic keyword in C++ code.
</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 = "*-*-darwin18*";
</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 = "# define _Atomic volatile\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c_fix_arg = "# undef _Atomic\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>