<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7d0ba69d784def6d362b1cddff85acb8783b821e">https://github.com/macports/macports-ports/commit/7d0ba69d784def6d362b1cddff85acb8783b821e</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 7d0ba69 cctools: Update as patch to allow search for MacPorts clang to be temporarily disabled via an environment variable
</span>7d0ba69 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7d0ba69d784def6d362b1cddff85acb8783b821e
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Feb 20 23:25:20 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> cctools: Update as patch to allow search for MacPorts clang to be temporarily disabled via an environment variable
</span>---
devel/cctools/Portfile | 2 +-
devel/cctools/files/as-try-clang.patch | 28 +++++++++++++++-------------
2 files changed, 16 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/Portfile b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 685cfb4..d7a2cde 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ name cctools
</span> # Xcode 10.2
version 927.0.2
set ld64_version 450.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
platforms darwin
maintainers {jeremyhu @jeremyhu} {kencu @kencu} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/files/as-try-clang.patch b/devel/cctools/files/as-try-clang.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e2216c..094038b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/files/as-try-clang.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/files/as-try-clang.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- as/driver.c.orig 2019-05-25 16:26:59.000000000 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ as/driver.c 2019-05-25 16:49:42.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -295,11 +295,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ as/driver.c 2020-02-20 23:44:18.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,11 +295,28 @@
</span> arch_flag.cputype == CPU_TYPE_ARM64 ||
arch_flag.cputype == CPU_TYPE_ARM64_32 ||
arch_flag.cputype == CPU_TYPE_ARM)){
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,19 +9,21 @@
</span> - printf("%s: assembler (%s) not installed\n", progname, as);
- exit(1);
- }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char * mp_comps[] = { __MP_CLANG_NAMES__ };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const size_t n_comps = sizeof(mp_comps) / sizeof(mp_comps[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ( size_t i = 0; i < n_comps; ++i ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ as = makestr(prefix, mp_comps[i], NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(access(as, F_OK) == 0){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // found working compiler so break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ as = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( NULL == getenv("DISABLE_MACPORTS_AS_CLANG_SEARCH") ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char * mp_comps[] = { __MP_CLANG_NAMES__ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const size_t n_comps = sizeof(mp_comps) / sizeof(mp_comps[0]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for ( size_t i = 0; i < n_comps; ++i ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ as = makestr(prefix, mp_comps[i], NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(access(as, F_OK) == 0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // found working compiler so break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ as = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span> + }
+ }
+#if __TRY_SYSTEM_CLANG__
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( as == NULL ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( NULL == as && NULL == getenv("DISABLE_XCODE_AS_CLANG_SEARCH") ) {
</span> + as = "/usr/bin/clang";
+ if(access(as, F_OK) != 0){
+ as = NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +34,7 @@
</span> new_argv = allocate((argc + 8) * sizeof(char *));
new_argv[0] = as;
j = 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -360,6 +375,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -360,6 +377,7 @@
</span> exit(0);
else
exit(1);
</pre><pre style='margin:0'>
</pre>