diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2023-11-19 17:26:36 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2023-11-19 17:26:36 +0000 |
| commit | 1e9c76e50330b33e49165da12a82be2265adad04 (patch) | |
| tree | b1bcde0157621d8089c9bb6700f9b50d77ce41ae /app-editors | |
| parent | sci-libs/rocRAND: add dev-cpp/benchmark dependency. (diff) | |
| download | gentoo-1e9c76e50330b33e49165da12a82be2265adad04.tar.gz gentoo-1e9c76e50330b33e49165da12a82be2265adad04.tar.bz2 gentoo-1e9c76e50330b33e49165da12a82be2265adad04.zip | |
app-editors/emacs: Override EMACS var for emake install when cross-compiling
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>
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/emacs-29.1-r5.ebuild | 10 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-29.1.90.ebuild | 10 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-29.1.9999.ebuild | 10 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-30.0.9999.ebuild | 10 |
4 files changed, 24 insertions, 16 deletions
diff --git a/app-editors/emacs/emacs-29.1-r5.ebuild b/app-editors/emacs/emacs-29.1-r5.ebuild index 12d36dabf21a..4b7c9693bece 100644 --- a/app-editors/emacs/emacs-29.1-r5.ebuild +++ b/app-editors/emacs/emacs-29.1-r5.ebuild @@ -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 diff --git a/app-editors/emacs/emacs-29.1.90.ebuild b/app-editors/emacs/emacs-29.1.90.ebuild index ac342a06b3fd..14dd93aefa00 100644 --- a/app-editors/emacs/emacs-29.1.90.ebuild +++ b/app-editors/emacs/emacs-29.1.90.ebuild @@ -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 diff --git a/app-editors/emacs/emacs-29.1.9999.ebuild b/app-editors/emacs/emacs-29.1.9999.ebuild index ac342a06b3fd..14dd93aefa00 100644 --- a/app-editors/emacs/emacs-29.1.9999.ebuild +++ b/app-editors/emacs/emacs-29.1.9999.ebuild @@ -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 diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index 5f9be5cc4991..ab14d02c094b 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -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 |