gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

app-editors/emacs: Override EMACS var for emake install when cross-compiling

Browse Source 
Version 29 changed some of the Makefile logic, and part of it is wonky, with it
wanting to runs emacs during the install target. I tried to fix it but couldn't.
Something about autoloads being a PHONY target.

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
This commit is contained in:
James Le Cuirot
2023-11-19 17:26:36 +00:00
parent eaaa5dfd40
commit 1e9c76e503
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app-editors/emacs/emacs-29.1-r5.ebuild
View File

@@ -390,10 +390,12 @@ src_compile() {
# Save native build tools in the cross-directory
cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
# Specify the native Emacs to compile lisp
emake -C lisp all EMACS="${S}-build/src/emacs"
EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
emake "${EMACS_EMAKE_ARGS[@]}" actual-all
else
unset EMACS_EMAKE_ARGS
emake
fi
emake
}
src_test() {
@@ -441,7 +443,7 @@ src_test() {
}
src_install() {
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die

10
app-editors/emacs/emacs-29.1.90.ebuild
View File

@@ -387,10 +387,12 @@ src_compile() {
# Save native build tools in the cross-directory
cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
# Specify the native Emacs to compile lisp
emake -C lisp all EMACS="${S}-build/src/emacs"
EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
emake "${EMACS_EMAKE_ARGS[@]}" actual-all
else
unset EMACS_EMAKE_ARGS
emake
fi
emake
}
src_test() {
@@ -438,7 +440,7 @@ src_test() {
}
src_install() {
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die

10
app-editors/emacs/emacs-29.1.9999.ebuild
View File

@@ -387,10 +387,12 @@ src_compile() {
# Save native build tools in the cross-directory
cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
# Specify the native Emacs to compile lisp
emake -C lisp all EMACS="${S}-build/src/emacs"
EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
emake "${EMACS_EMAKE_ARGS[@]}" actual-all
else
unset EMACS_EMAKE_ARGS
emake
fi
emake
}
src_test() {
@@ -438,7 +440,7 @@ src_test() {
}
src_install() {
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die

10
app-editors/emacs/emacs-30.0.9999.ebuild
View File

@@ -389,10 +389,12 @@ src_compile() {
# Save native build tools in the cross-directory
cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
# Specify the native Emacs to compile lisp
emake -C lisp all EMACS="${S}-build/src/emacs"
EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
emake "${EMACS_EMAKE_ARGS[@]}" actual-all
else
unset EMACS_EMAKE_ARGS
emake
fi
emake
}
src_test() {
@@ -440,7 +442,7 @@ src_test() {
}
src_install() {
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die