jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

emacs: remove emacs-common-eln, put eln into binary packages.

Browse source 
The builds have different hashes, so the .eln files cannot be shared.
This commit is contained in:
Leah Neukirchen 2022-04-16 18:31:18 +02:00
parent e8c5062adf
commit 27f3057db6
2 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/emacs-common-eln
View file

@ -1 +0,0 @@
emacs

28
srcpkgs/emacs/template
View file

@ -1,7 +1,7 @@
# Template file for 'emacs'
pkgname=emacs
version=28.1
revision=2
revision=3
build_style=gnu-configure
configure_args="--with-file-notification=inotify --with-modules
$(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
@ -68,12 +68,11 @@ do_configure() {
do_build() {
make ${makejobs} -C nox
make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
make ${makejobs} -C gtk3
make ${makejobs} -C gtk3 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
}
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*
@ -84,6 +83,7 @@ do_install() {
emacs-common_package() {
short_desc+=" - common files"
replaces="emacs-common-eln>=0"
pkg_install() {
vmove usr/share/emacs
vmove usr/share/man
@ -92,23 +92,8 @@ 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"
@ -116,15 +101,12 @@ emacs-x11_package() {
make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/x11 install
rm -f ${PKGDESTDIR}/usr/bin/ctags
rm -rf ${PKGDESTDIR}/usr/share
rm -rf ${PKGDESTDIR}/usr/lib
rm -rf ${PKGDESTDIR}/usr/lib/systemd
}
}
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"
@ -132,6 +114,6 @@ emacs-gtk3_package() {
make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk3 install
rm -f ${PKGDESTDIR}/usr/bin/ctags
rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info}
rm -rf ${PKGDESTDIR}/usr/lib
rm -rf ${PKGDESTDIR}/usr/lib/systemd
}
}