<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/dcefaea1eca247c8ed6e8feb6d982598446c172e">https://github.com/macports/macports-ports/commit/dcefaea1eca247c8ed6e8feb6d982598446c172e</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 dcefaea gcc7: remove unneccessary patch for Xcode bug fix, now incorporated upstream
</span>dcefaea is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dcefaea1eca247c8ed6e8feb6d982598446c172e
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Nov 14 14:50:52 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> gcc7: remove unneccessary patch for Xcode bug fix, now incorporated upstream
</span>---
lang/gcc7/Portfile | 10 --
lang/gcc7/files/xcode-bug-_Atomic-fix.patch | 138 ----------------------------
2 files changed, 148 deletions(-)
<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 d18a806..1e9cb71 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,7 +3,6 @@
</span> PortSystem 1.0
PortGroup select 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcodeversion 1.0
</span> PortGroup conflicts_build 1.0
name gcc7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,15 +63,6 @@ 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:#ffe0e0;'>-if {[vercmp ${xcodeversion} 10.2] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/58260
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Patch for Xcode bug, taken from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89864#c43
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/Homebrew/homebrew-core/pull/39134/files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This should be removed in the next release of GCC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append xcode-bug-_Atomic-fix.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set major [lindex [split ${version} .-] 0]
platform darwin {
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 70f0459..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc7/files/xcode-bug-_Atomic-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,138 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ad5824d..e36abe8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fixincludes/fixincl.x.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fixincludes/fixincl.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,11 +2,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * DO NOT EDIT THIS FILE (fixincl.x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * It has been AutoGen-ed Saturday February 25, 2017 at 03:25:44 PM EST
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * 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:#ffe0e0;'>- * From the definitions inclhack.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * and the template file fixincl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* DO NOT SVN-MERGE THIS FILE, EITHER Sat 25 Feb 2017 15:25:44 EST
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Apr 16 09:32:25 IST 2019
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * You must regenerate it. Use the ./genfixes script.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * certain ANSI-incompatible system header files which are fixed to work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * correctly with ANSI C and placed in a directory that GNU C will search.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * This file contains 248 fixup descriptions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This file contains 249 fixup descriptions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * See README for more information.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3262,6 +3262,48 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* * * * * * * * * * * * * * * * * * * * * * * * * *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Description of Darwin_Ucred__Atomic fix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tSCC zDarwin_Ucred__AtomicName[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "darwin_ucred__Atomic";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * File name selection pattern
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tSCC zDarwin_Ucred__AtomicList[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "sys/ucred.h\0";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Machine/OS name selection pattern
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tSCC* apzDarwin_Ucred__AtomicMachs[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "*-*-darwin*",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (const char*)NULL };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * content selection pattern - do fix if pattern found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tSCC zDarwin_Ucred__AtomicSelect0[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "_Atomic";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define DARWIN_UCRED__ATOMIC_TEST_CT 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static tTestDesc aDarwin_Ucred__AtomicTests[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { TT_EGREP, zDarwin_Ucred__AtomicSelect0, (regex_t*)NULL }, };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Fix Command Arguments for Darwin_Ucred__Atomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const char* apzDarwin_Ucred__AtomicPatch[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "wrap",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define _Atomic volatile\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# undef _Atomic\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (char*)NULL };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* * * * * * * * * * * * * * * * * * * * * * * * * *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Description of Dec_Intern_Asm fix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tSCC zDec_Intern_AsmName[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10139,9 +10181,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * List of all fixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define REGEX_COUNT 285
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define REGEX_COUNT 286
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MACH_LIST_SIZE_LIMIT 187
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FIX_COUNT 248
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FIX_COUNT 249
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Enumerate the fixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10222,6 +10264,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DARWIN_STDINT_5_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DARWIN_STDINT_6_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DARWIN_STDINT_7_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DARWIN_UCRED__ATOMIC_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEC_INTERN_ASM_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DJGPP_WCHAR_H_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ECD_CURSOR_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10773,6 +10816,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aDarwin_Stdint_7Tests, apzDarwin_Stdint_7Patch, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { zDarwin_Ucred__AtomicName, zDarwin_Ucred__AtomicList,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ apzDarwin_Ucred__AtomicMachs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { zDec_Intern_AsmName, zDec_Intern_AsmList,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- apzDec_Intern_AsmMachs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8fd9f7e..98f1654 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fixincludes/inclhack.def.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fixincludes/inclhack.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1688,6 +1688,25 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#define UINTMAX_C(v) (v ## ULL)";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* 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:#ffe0e0;'>-+ C11 _Atomic keyword (exposing it to C++ code). The work-around here follows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ the header in declaring the entity volatile when _Atomic is not available.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fix = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hackname = darwin_ucred__Atomic;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mach = "*-*-darwin*";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ files = sys/ucred.h;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ select = "_Atomic";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ c_fix = wrap;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ c_fix_arg = "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "# define _Atomic volatile\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "#endif\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ c_fix_arg = "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "# undef _Atomic\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "#endif\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test_text = "_Atomic";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Fix <c_asm.h> on Digital UNIX V4.0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * It contains a prototype for a DEC C internal asm() function,
</span></pre><pre style='margin:0'>
</pre>