<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/61c87f79549a38b2b8e9354d6a7f0c86c842ca58">https://github.com/macports/macports-ports/commit/61c87f79549a38b2b8e9354d6a7f0c86c842ca58</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 61c87f79549 gcc10: include runtime JIT support (required for emacs native compilation)
</span>61c87f79549 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 61c87f79549a38b2b8e9354d6a7f0c86c842ca58
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Mon Aug 31 18:31:19 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> gcc10: include runtime JIT support (required for emacs native compilation)
</span>---
lang/gcc10/Portfile | 18 +++++++---
lang/gcc10/files/patch-fix-libgccjit-soname | 51 +++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10/Portfile b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 823f6f8bb24..577e7028e51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,8 @@ PortGroup conflicts_build 1.0
</span> epoch 5
name gcc10
version 10.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc10 { revision 0 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc10 { revision 1 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +47,8 @@ checksums rmd160 73f182e7d40e5c2988b2b8cd80cfca601f20e9fc \
</span> sha256 b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c \
size 75004144
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-fix-libgccjit-soname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:cctools \
port:gmp \
path:lib/pkgconfig/isl.pc:isl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,9 +69,14 @@ platform darwin {
</span> configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set gcc_configure_langs {c c++ objc obj-c++ lto fortran}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "gcc10"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend gcc_configure_langs jit
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-languages=c,c++,objc,obj-c++,lto,fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-languages=[join ${gcc_configure_langs} ","] \
</span> --libdir=${prefix}/lib/${name} \
--includedir=${prefix}/include/${name} \
--infodir=${prefix}/share/info \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +99,8 @@ configure.args --enable-languages=c,c++,objc,obj-c++,lto,fortran \
</span> --with-as=${prefix}/bin/as \
--with-ld=${prefix}/bin/ld \
--with-ar=${prefix}/bin/ar \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-bugurl=https://trac.macports.org/newticket
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bugurl=https://trac.macports.org/newticket \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-host-shared
</span>
# see https://lists.macports.org/pipermail/macports-dev/2017-August/036209.html
# --disable-tls does not limit functionality
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,6 +293,8 @@ if {${subport} eq "libgcc10"} {
</span> file rename ${file} ${newfile}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${prefix}/lib/${name}/libgccjit.0.dylib ${destroot}${prefix}/lib/${name}/libgccjit.0.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # loop over libs to install
foreach dylib ${dylibs} {
# Different OS versions (e.g. Leopard) or architectures (e.g. PPC) don't produce all the dylibs
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10/files/patch-fix-libgccjit-soname b/lang/gcc10/files/patch-fix-libgccjit-soname
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8ca4e7cbbcb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc10/files/patch-fix-libgccjit-soname
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gcc/jit/Make-lang.in.orig 2020-08-27 13:02:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gcc/jit/Make-lang.in 2020-08-27 13:29:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,16 +40,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # into the jit rule, but that needs a little bit of work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to do the right thing within all.cross.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBGCCJIT_LINKER_NAME = libgccjit.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBGCCJIT_VERSION_NUM = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBGCCJIT_MINOR_NUM = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBGCCJIT_RELEASE_NUM = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBGCCJIT_SONAME = $(LIBGCCJIT_LINKER_NAME).$(LIBGCCJIT_VERSION_NUM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBGCCJIT_FILENAME = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(LIBGCCJIT_SONAME).$(LIBGCCJIT_MINOR_NUM).$(LIBGCCJIT_RELEASE_NUM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBGCCJIT_LINKER_NAME_SYMLINK = $(LIBGCCJIT_LINKER_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBGCCJIT_SONAME_SYMLINK = $(LIBGCCJIT_SONAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(strip $(filter-out darwin%,$(target_os))),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBGCCJIT_LINKER_NAME = libgccjit.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBGCCJIT_FILENAME = libgccjit.$(LIBGCCJIT_VERSION_NUM).dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBGCCJIT_LINKER_NAME = libgccjit.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBGCCJIT_SONAME = $(LIBGCCJIT_LINKER_NAME).$(LIBGCCJIT_VERSION_NUM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBGCCJIT_FILENAME = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(LIBGCCJIT_SONAME).$(LIBGCCJIT_MINOR_NUM).$(LIBGCCJIT_RELEASE_NUM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBGCCJIT_LINKER_NAME_SYMLINK = $(LIBGCCJIT_LINKER_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBGCCJIT_SONAME_SYMLINK = $(LIBGCCJIT_SONAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Conditionalize the use of the LD_VERSION_SCRIPT_OPTION and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LD_SONAME_OPTION depending if configure found them, using $(if)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -278,12 +284,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jit.install-common: installdirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_PROGRAM) $(LIBGCCJIT_FILENAME) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DESTDIR)/$(libdir)/$(LIBGCCJIT_FILENAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(strip $(filter-out darwin%,$(target_os))),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install_name_tool -id $(libdir)/$(LIBGCCJIT_FILENAME) $(DESTDIR)/$(libdir)/$(LIBGCCJIT_FILENAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ln -sf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(LIBGCCJIT_FILENAME) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(DESTDIR)/$(libdir)/$(LIBGCCJIT_LINKER_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LIBGCCJIT_FILENAME) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DESTDIR)/$(libdir)/$(LIBGCCJIT_SONAME_SYMLINK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LIBGCCJIT_SONAME_SYMLINK)\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DESTDIR)/$(libdir)/$(LIBGCCJIT_LINKER_NAME_SYMLINK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_DATA) $(srcdir)/jit/libgccjit.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DESTDIR)/$(includedir)/libgccjit.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \
</span></pre><pre style='margin:0'>
</pre>