<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/686d35d8b3d5e28567bcc9205fd7850e87a83944">https://github.com/macports/macports-ports/commit/686d35d8b3d5e28567bcc9205fd7850e87a83944</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 686d35d upc: fix configure due to missing dependency to cctools and build due to Xcode bug
</span>686d35d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 686d35d8b3d5e28567bcc9205fd7850e87a83944
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Fri Jan 3 11:45:23 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> upc: fix configure due to missing dependency to cctools and build due to
</span><span style='display:block; white-space:pre;color:#404040;'> Xcode bug
</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/59878
</span>---
lang/upc/Portfile | 31 +++++++-
lang/upc/files/xcode-bug-_Atomic-fix.patch | 111 +++++++++++++++++++++++++++++
2 files changed, 141 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/upc/Portfile b/lang/upc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e4dd01..e2c87b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/upc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/upc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,8 @@ depends_lib port:gmp port:mpfr port:libiconv port:libmpc \
</span> port:isl14 \
port:ld64 \
path:lib/libgcc/libgcc_s.1.dylib:libgcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:gdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:gdb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cctools
</span>
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +48,22 @@ pre-configure {
</span> if {${os.platform} eq "darwin" && ${os.arch} eq "powerpc"} {
ui_error "PowerPC is not supported"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We should be using --with-build-sysroot here. Using --with-sysroot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # changes the behavior of the installed gcc to look in that sysroot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # by default instead of /. Using --with-build-sysroot is supposed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to be used during the build but not impact the installed product.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Unfortunately, the build fails because the value doesn't get
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # plumbed everywhere it is supposed to.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/53726
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79885
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note that macports toolchains will fail to compile gcc unless
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the DevSDK is installed due to another gcc build system bug:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80203
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-sysroot="${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# http://trac.macports.org/ticket/29067
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +82,14 @@ post-extract {
</span> ln -s ${prefix}/libexec/isl14/include/isl ${build.dir}/gcc
}
<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;'>+ 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 --bindir=${prefix}/lib/${name}/bin \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,6 +113,10 @@ configure.args --bindir=${prefix}/lib/${name}/bin \
</span> --with-ls=${prefix}/bin/ld \
--with-ar=${prefix}/bin/ar \
--with-bugurl=https://trac.macports.org/newticket
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-build-sysroot="${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
configure.env-append \
AR_FOR_TARGET=${prefix}/bin/ar \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/upc/files/xcode-bug-_Atomic-fix.patch b/lang/upc/files/xcode-bug-_Atomic-fix.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7b68205
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/upc/files/xcode-bug-_Atomic-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,111 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fixincludes/fixincl.x.orig 2015-08-12 14:28:28.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/fixincl.x 2020-01-03 11:33:28.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2855,6 +2855,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;'>+@@ -9396,9 +9438,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 266
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define REGEX_COUNT 267
</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 229
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FIX_COUNT 230
</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;'>+@@ -9469,6 +9511,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;'>+@@ -9961,6 +10004,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;'>+--- fixincludes/inclhack.def.orig 2015-08-12 14:28:28.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/inclhack.def 2020-01-03 11:35:22.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1524,6 +1524,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>