<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9f26eb265fd85a35f0a974f821619b0bae7cda62">https://github.com/macports/macports-ports/commit/9f26eb265fd85a35f0a974f821619b0bae7cda62</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 9f26eb265fd emacs{,-app}-devel: add nativecomp variant
</span>9f26eb265fd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9f26eb265fd85a35f0a974f821619b0bae7cda62
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Fri Nov 13 21:31:43 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> emacs{,-app}-devel: add nativecomp variant
</span>---
editors/emacs/Portfile | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e6e8f9ee870..403f46a42cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,7 @@ if {$subport eq $name || $subport eq "emacs-app"} {
</span> size 65782481
# apply upstream patch to fix configure on arm machines
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/61594 and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://trac.macports.org/ticket/61594 and
</span> # https://git.savannah.gnu.org/cgit/emacs.git/commit/configure.ac?id=4cba236749aafade7bd88cf2a10be48f44983faa
patchfiles-append patch-4cba236749aafade7bd88cf2a10be48f44983faa.diff
use_autoreconf yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +114,26 @@ if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
</span> }
livecheck.type none
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant nativecomp description {Builds emacs with native compilation support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch 949b49cf771e8f38b23adb3fa4f9d7a9a5e290da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:coreutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gcc10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.install ${prefix}/bin/ginstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-nativecomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-prepend ${prefix}/include/gcc10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.library_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/gcc10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append NATIVE_FULL_AOT=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 2)"'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # currently installs into ${prefix}/native-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
livecheck.type regex
livecheck.url https://ftp.gnu.org/gnu/emacs/?C=M&O=D
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,6 +212,12 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
</span> xinstall -m 755 -d ${destroot}${prefix}/include/emacs
xinstall -m 644 ${worksrcpath}/src/emacs-module.h \
${destroot}${prefix}/include/emacs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset nativecomp]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make special symlink (temporarily?) necessary for nativecomp on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set emacs_version [file tail [glob ${destroot}${prefix}/lib/emacs/*]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s lib/emacs/${emacs_version}/native-lisp ${destroot}${prefix}/native-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,6 +257,13 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span> ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp
reinplace "s|__PREFIX__|${prefix}|g" \
${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset nativecomp]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make special symlink (temporarily?) necessary for nativecomp on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set app_contents ${destroot}${applications_dir}/Emacs.app/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set emacs_version [file tail [glob ${app_contents}/MacOS/lib/emacs/*]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s MacOS/lib/emacs/${emacs_version}/native-lisp ${app_contents}/native-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant imagemagick description {Use ImageMagick} {
</pre><pre style='margin:0'>
</pre>