<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/61ac819d498927f81dd795e6d11e35a2cf6e2da0">https://github.com/macports/macports-ports/commit/61ac819d498927f81dd795e6d11e35a2cf6e2da0</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 61ac819d498 {lib}gcc-devel: remove incompatible patchfile
</span>61ac819d498 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 61ac819d498927f81dd795e6d11e35a2cf6e2da0
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Oct 30 10:23:24 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> {lib}gcc-devel: remove incompatible patchfile
</span>---
lang/gcc-devel/Portfile | 20 ++-------
lang/gcc-devel/files/patch-fix-libgccjit-soname | 58 -------------------------
2 files changed, 4 insertions(+), 74 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc-devel/Portfile b/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84f00c33073..92f40f9bb11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,8 +48,6 @@ checksums rmd160 df883a558afbdacac2152432873e2fd74c3c7125 \
</span> sha256 dd59afe340edc66b62626117790f0310d088b52d350118e48c061c08a6422be1 \
size 72628316
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-fix-libgccjit-soname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:cctools \
port:gmp \
path:lib/pkgconfig/isl.pc:isl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,25 +138,15 @@ pre-configure {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Added for gcc9+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://trac.macports.org/ticket/29067
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append gcc-4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://trac.macports.org/ticket/29104
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/29067
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/29104
</span> # https://trac.macports.org/ticket/47996
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 300}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # https://trac.macports.org/ticket/58493
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 800} *gcc-4.2 macports-clang-3.4 macports-clang-3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.fallback-append macports-clang-7.0 macports-clang-8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 800} gcc-4.0 *gcc-4.2 {llvm-gcc-4.2 < 2336.1} {macports-clang-3.[4-7]}
</span>
# at present, clang-9.0+ can't build gcc devel
# https://trac.macports.org/ticket/59253
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append macports-clang-9.0 macports-clang-10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compiler.blacklist-append macports-clang-9.0 macports-clang-10
</span>
# "-stdlib" would be passed on to the bootstrap compiler if present
configure.cxx_stdlib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc-devel/files/patch-fix-libgccjit-soname b/lang/gcc-devel/files/patch-fix-libgccjit-soname
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b5c2f569db9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc-devel/files/patch-fix-libgccjit-soname
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/jit/Make-lang.in.orig 2020-09-01 10:19:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcc/jit/Make-lang.in 2020-09-01 10:25:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,17 +48,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBGCCJIT_LINKER_NAME = libgccjit.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBGCCJIT_VERSION_NUM = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBGCCJIT_MINOR_NUM = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBGCCJIT_RELEASE_NUM = 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBGCCJIT_SONAME = $(LIBGCCJIT_LINKER_NAME).$(LIBGCCJIT_VERSION_NUM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBGCCJIT_FILENAME = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(LIBGCCJIT_SONAME).$(LIBGCCJIT_MINOR_NUM).$(LIBGCCJIT_RELEASE_NUM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifeq ($(strip $(filter-out darwin%,$(target_os))),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBGCCJIT_LINKER_NAME = libgccjit.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBGCCJIT_FILENAME = libgccjit.$(LIBGCCJIT_VERSION_NUM).dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBGCCJIT_LINKER_NAME = libgccjit.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBGCCJIT_SONAME = $(LIBGCCJIT_LINKER_NAME).$(LIBGCCJIT_VERSION_NUM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBGCCJIT_FILENAME = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LIBGCCJIT_SONAME).$(LIBGCCJIT_MINOR_NUM).$(LIBGCCJIT_RELEASE_NUM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBGCCJIT_LINKER_NAME_SYMLINK = $(LIBGCCJIT_LINKER_NAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBGCCJIT_SONAME_SYMLINK = $(LIBGCCJIT_SONAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBGCCJIT_LINKER_NAME_SYMLINK = $(LIBGCCJIT_LINKER_NAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBGCCJIT_SONAME_SYMLINK = $(LIBGCCJIT_SONAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Conditionalize the use of the LD_VERSION_SCRIPT_OPTION and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # LD_SONAME_OPTION depending if configure found them, using $(if)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,9 +132,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(LIBGCCJIT_SONAME_SYMLINK): $(LIBGCCJIT_FILENAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -sf $(LIBGCCJIT_FILENAME) $(LIBGCCJIT_SONAME_SYMLINK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifneq ($(strip $(filter-out darwin%,$(target_os))),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(LIBGCCJIT_LINKER_NAME_SYMLINK): $(LIBGCCJIT_SONAME_SYMLINK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -sf $(LIBGCCJIT_SONAME_SYMLINK) $(LIBGCCJIT_LINKER_NAME_SYMLINK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</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;'>- # Build hooks:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -313,6 +320,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install DLL file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL_PROGRAM) $(LIBGCCJIT_FILENAME) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(DESTDIR)$(bindir)/$(LIBGCCJIT_FILENAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else ifeq ($(strip $(filter-out darwin%,$(target_os))),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+jit.install-common: installdirs jit.install-headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_PROGRAM) $(LIBGCCJIT_FILENAME) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(DESTDIR)$(libdir)/$(LIBGCCJIT_FILENAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install_name_tool -id $(libdir)/$(LIBGCCJIT_FILENAME) $(DESTDIR)/$(libdir)/$(LIBGCCJIT_FILENAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -sf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LIBGCCJIT_FILENAME) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(DESTDIR)/$(libdir)/$(LIBGCCJIT_LINKER_NAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jit.install-common: installdirs jit.install-headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL_PROGRAM) $(LIBGCCJIT_FILENAME) \
</span></pre><pre style='margin:0'>
</pre>