Frederik Schwan pushed to branch main at Arch Linux / Packaging / Packages /
emacs
Commits:
1bb7933d by Frederik Schwan at 2025-02-24T09:50:37+01:00
replace emacs-nativecomp with emacs
emacs now enables nativecomp by default
- - - - -
1 changed file:
- PKGBUILD
Changes:
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
# Contributor: Renchi Raju <ren...@green.tam.uiuc.edu>
pkgbase=emacs
-pkgname=(emacs emacs-nativecomp emacs-nox emacs-wayland)
+pkgname=(emacs emacs-nox emacs-wayland)
pkgver=30.1
pkgrel=1
arch=('x86_64')
@@ -17,6 +17,7 @@ depends=(
lcms2
libacl.so
libasound.so
+ libgccjit
libdbus-1.so
libfontconfig.so
libfreetype.so
@@ -56,7 +57,6 @@ validpgpkeys=('17E90D521672C04631B1183EE78DAE0F3115E06B' #
Eli Zaretskii <eliz@
'CEA1DE21AB108493CC9C65742E82323B8F4353EE') # Stefan Kangas
<stefankan...@gmail.com>
prepare() {
- cp --reflink=auto -ar ${pkgname}-${pkgver} ${pkgbase}-${pkgver}-nativecomp
cp --reflink=auto -ar ${pkgname}-${pkgver} ${pkgbase}-${pkgver}-nox
cp --reflink=auto -ar ${pkgname}-${pkgver} ${pkgbase}-${pkgver}-wayland
}
@@ -80,13 +80,6 @@ build() {
--with-x-toolkit=gtk3
make
- cd ../${pkgbase}-${pkgver}-nativecomp
- ./configure \
- --with-x-toolkit=gtk3 \
- --with-native-compilation=aot \
- $_confflags
- make bootstrap
-
cd ../${pkgbase}-${pkgver}-nox
./configure \
--without-x \
@@ -97,13 +90,13 @@ build() {
cd ../${pkgbase}-${pkgver}-wayland
./configure \
--with-pgtk \
- --with-native-compilation=aot \
$_confflags
make bootstrap
}
package_emacs() {
pkgdesc='The extensible, customizable, self-documenting real-time display
editor'
+ replaces=(emacs-nativecomp)
cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
@@ -116,23 +109,6 @@ package_emacs() {
find "${pkgdir}"/usr/share/emacs/${pkgver} -exec chown root:root {} \;
}
-package_emacs-nativecomp() {
- pkgdesc='The extensible, customizable, self-documenting real-time display
editor with native compilation enabled'
- depends+=(libgccjit)
- provides=(emacs)
- conflicts=(emacs)
-
- cd ${pkgbase}-${pkgver}-nativecomp
- make DESTDIR="${pkgdir}" install
-
- # remove conflict with ctags package
- mv "${pkgdir}"/usr/bin/{ctags,ctags.emacs}
- mv "${pkgdir}"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-
- # fix user/root permissions on usr/share files
- find "${pkgdir}"/usr/share/emacs/${pkgver} -exec chown root:root {} \;
-}
-
package_emacs-nox() {
pkgdesc='The extensible, customizable, self-documenting real-time display
editor without X11 support'
depends=(
@@ -165,8 +141,7 @@ package_emacs-nox() {
}
package_emacs-wayland() {
- pkgdesc='The extensible, customizable, self-documenting real-time display
editor with native compilation and PGTK enabled'
- depends+=(libgccjit)
+ pkgdesc='The extensible, customizable, self-documenting real-time display
editor with PGTK enabled'
provides=(emacs)
conflicts=(emacs)
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/emacs/-/commit/1bb7933d6c1b4c6105ba1e350970010ba428f9f5
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/emacs/-/commit/1bb7933d6c1b4c6105ba1e350970010ba428f9f5
You're receiving this email because of your account on gitlab.archlinux.org.
