Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

emacs: enable support for native-compilation. #36690

Merged
merged 1 commit into from
Apr 16, 2022
Merged

emacs: enable support for native-compilation. #36690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions srcpkgs/emacs-common-eln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
emacs
46 changes: 36 additions & 10 deletions srcpkgs/emacs/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Template file for 'emacs'
pkgname=emacs
version=28.1
revision=1
revision=2
build_style=gnu-configure
configure_args="--with-file-notification=inotify --with-modules
$(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
$(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
$(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)
$(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)"
$(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)
$(vopt_with nativecomp native-compilation)"
hostmakedepends="pkg-config tar"
makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
dbus-devel acl-devel
Expand All @@ -17,7 +18,8 @@ makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
$(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
$(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel)
$(vopt_if json jansson-devel) $(vopt_if harfbuzz harfbuzz-devel)
$(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)"
$(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)
$(vopt_if nativecomp libgccjit-devel)"
depends="emacs-common-${version}_${revision}"
short_desc="GNU Emacs editor"
maintainer="Leah Neukirchen <leah@vuxu.org>"
Expand All @@ -29,12 +31,16 @@ nocross=yes
nopie=yes

# Package build options
build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp"
desc_option_xpm="Enable support for XPM images"
desc_option_sound="Enable support for sound"
build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp nativecomp"
desc_option_cairo="Enable support for drawing with Cairo"
desc_option_gmp="Enable support for big numbers using GMP"
desc_option_json="Enable support for native JSON parsing"
desc_option_m17n="Enable support for m17n multilingual text processing"
build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n png sound
svg tiff xml xpm"
desc_option_nativecomp="Enable support for native compilation"
desc_option_sound="Enable support for sound"
desc_option_xpm="Enable support for XPM images"
build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp
png sound svg tiff xml xpm"

pre_configure() {
# Just configuring in different directories results in
Expand All @@ -47,7 +53,8 @@ pre_configure() {

do_configure() {
cd $wrksrc/nox
./configure --without-x $(vopt_with dbus) ${configure_args}
./configure --without-x $(vopt_with dbus) ${configure_args} \
--without-native-compilation

cd $wrksrc/x11
./configure --with-x-toolkit=athena --without-toolkit-scroll-bars \
Expand All @@ -60,12 +67,13 @@ do_configure() {

do_build() {
make ${makejobs} -C nox
make ${makejobs} -C x11
make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
make ${makejobs} -C gtk3
}

do_install() {
make DESTDIR=$DESTDIR -C ${wrksrc}/nox install
make DESTDIR=$DESTDIR -C ${wrksrc}/x11 install-eln
rm -f ${DESTDIR}/usr/bin/ctags
rm -f ${DESTDIR}/usr/lib/systemd/user/emacs.service
rm -f ${DESTDIR}/usr/share/man/man1/ctags.1*
Expand All @@ -84,8 +92,23 @@ emacs-common_package() {
}
}

emacs-common-eln_package() {
short_desc+=" - common precompiled elisp"
if [ -z "$build_option_nativecomp" ]; then
build_style=meta
fi
pkg_install() {
if [ "$build_option_nativecomp" ]; then
vmove usr/lib/emacs
fi
}
}

emacs-x11_package() {
depends="emacs-common-${version}_${revision}"
if [ "$build_option_nativecomp" ]; then
depends+=" emacs-common-eln-${version}_${revision}"
fi
provides="emacs-${version}_${revision}"
replaces="emacs>=0"
short_desc+=" - X11 version"
Expand All @@ -99,6 +122,9 @@ emacs-x11_package() {

emacs-gtk3_package() {
depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
if [ "$build_option_nativecomp" ]; then
depends+=" emacs-common-eln-${version}_${revision}"
fi
provides="emacs-${version}_${revision}"
replaces="emacs>=0"
short_desc+=" - GTK+3 version"
Expand Down