<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/368383b4263282656853b68965c3db455333c5bd">https://github.com/macports/macports-ports/commit/368383b4263282656853b68965c3db455333c5bd</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 368383b gcc9,libgcc9: Add patch for Darwin19
</span>368383b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 368383b4263282656853b68965c3db455333c5bd
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Oct 8 22:48:39 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> gcc9,libgcc9: Add patch for Darwin19
</span>---
lang/gcc9/Portfile | 8 ++
.../files/darwin19-OSX_AVAILABLE_STARTING.patch | 139 +++++++++++++++++++++
2 files changed, 147 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/Portfile b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52f5131..b4de3c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,6 +57,14 @@ platform darwin {
</span> configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for Darwin19 issue, borrowed from Homebrew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/Homebrew/homebrew-core/blob/master/Formula/gcc.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# To be reviewed and hopefully removed when fixed either upstream by gcc or by Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} >= 19 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append darwin19-OSX_AVAILABLE_STARTING.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;color:#808080;'>diff --git a/lang/gcc9/files/darwin19-OSX_AVAILABLE_STARTING.patch b/lang/gcc9/files/darwin19-OSX_AVAILABLE_STARTING.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a503ebc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/files/darwin19-OSX_AVAILABLE_STARTING.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,139 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -pur gcc-9.2.0/fixincludes/fixincl.x gcc-9.2.0-fixed/fixincludes/fixincl.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fixincludes/fixincl.x.orig 2019-08-03 21:21:08.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/fixincl.x 2019-10-01 11:43:32.000000000 +0200
</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 July 7, 2019 at 11:43:37 AM by AutoGen 5.17.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * It has been AutoGen-ed October 1, 2019 at 11:43:32 AM by AutoGen 5.18.16
</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 Sun Jul 7 11:43:37 BST 2019
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Oct 1 11:43:32 CEST 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 255 fixup descriptions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This file contains 256 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;'>+@@ -2636,6 +2636,48 @@ static const char* apzDarwin_Availabilit
</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_Availability fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++tSCC zDarwin_AvailabilityName[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "darwin_availability";
</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_AvailabilityList[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "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_AvailabilityMachs[] = {
</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_AvailabilitySelect0[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "#endif /\\* __OSX_AVAILABLE_STARTING \\*/";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define DARWIN_AVAILABILITY_TEST_CT 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static tTestDesc aDarwin_AvailabilityTests[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { TT_EGREP, zDarwin_AvailabilitySelect0, (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_Availability
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const char* apzDarwin_AvailabilityPatch[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "format",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "#endif /* __OSX_AVAILABLE_STARTING */\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __OSX_AVAILABLE_STARTING\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define __OSX_AVAILABLE_STARTING(_osx, _ios)\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define __OSX_AVAILABLE_BUT_DEPRECATED(_osxIntro, _osxDep, _iosIntro, _iosDep)\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(_osxIntro, _osxDep, _iosIntro, _iosDep, _msg)\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif",
</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;'>+@@ -10346,9 +10388,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 293
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define REGEX_COUNT 294
</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 255
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FIX_COUNT 256
</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;'>+@@ -10416,6 +10458,7 @@ typedef enum {
</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_AVAILABILITYINTERNAL_FIXIDX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DARWIN_AVAILABILITY_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;'>+@@ -10922,6 +10965,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DARWIN_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aDarwin_AvailabilityinternalTests, apzDarwin_AvailabilityinternalPatch, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { zDarwin_AvailabilityName, zDarwin_AvailabilityList,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ apzDarwin_AvailabilityMachs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DARWIN_AVAILABILITY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ aDarwin_AvailabilityTests, apzDarwin_AvailabilityPatch, 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 gcc-9.2.0/fixincludes/inclhack.def gcc-9.2.0-fixed/fixincludes/inclhack.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fixincludes/inclhack.def.orig 2019-08-03 21:21:08.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/inclhack.def 2019-10-01 11:43:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1298,6 +1298,28 @@ fix = {
</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;'>++ * macOS 10.15 <Availability.h> does not define __OSX_AVAILABLE_STARTING on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * non-clang compilers.
</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_availability;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach = "*-*-darwin*";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ files = Availability.h;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ select = "#endif /\\* __OSX_AVAILABLE_STARTING \\*/";
</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 = <<- _EOFix_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif /* __OSX_AVAILABLE_STARTING */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ifndef __OSX_AVAILABLE_STARTING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define __OSX_AVAILABLE_STARTING(_osx, _ios)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define __OSX_AVAILABLE_BUT_DEPRECATED(_osxIntro, _osxDep, _iosIntro, _iosDep)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(_osxIntro, _osxDep, _iosIntro, _iosDep, _msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _EOFix_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test_text = "#endif /* __OSX_AVAILABLE_STARTING */";
</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 (and later fixes for long long)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * to be useful, the main math.h must use <> and not "" includes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span></pre><pre style='margin:0'>
</pre>