Date: Wed, 24 Nov 2021 05:23:01 GMT From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 04dcdd1a96de - main - Mk/Uses/emacs.mk: Sort the default FLAVOR to be first in FLAVORS. Message-ID: <202111240523.1AO5N1J9030469@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=04dcdd1a96de2a3c44d1d94d19d80023496eb81c commit 04dcdd1a96de2a3c44d1d94d19d80023496eb81c Author: Bryan Drewery <bdrewery@FreeBSD.org> AuthorDate: 2021-11-24 01:59:27 +0000 Commit: Bryan Drewery <bdrewery@FreeBSD.org> CommitDate: 2021-11-24 05:22:58 +0000 Mk/Uses/emacs.mk: Sort the default FLAVOR to be first in FLAVORS. commit 9823f56764e6cf0 has more information. Poudriere expects the default to be always be first or it gets confused. --- Mk/Uses/emacs.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk index 6cc2a98dcc13..a51e5ab8dccb 100644 --- a/Mk/Uses/emacs.mk +++ b/Mk/Uses/emacs.mk @@ -80,6 +80,10 @@ _EMACS_RUN_DEP= yes # Only set FLAVORS when... .if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS) FLAVORS= full canna nox devel_full devel_nox +# Sort the default to be first +.if defined(EMACS_DEFAULT) +FLAVORS:= ${EMACS_DEFAULT} ${FLAVORS:N${EMACS_DEFAULT}} +.endif .for flavor in ${EMACS_FLAVORS_EXCLUDE} FLAVORS:= ${FLAVORS:N${flavor}} .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111240523.1AO5N1J9030469>