aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2021-11-24 01:59:27 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2021-11-24 05:22:58 +0000
commit04dcdd1a96de2a3c44d1d94d19d80023496eb81c (patch)
tree3cd6ad95f0b596ad1eaff72dfbbf244ab36ff2a6
parent546f3b949f0d63056b7966ecd7b6ec5e2fdeac5f (diff)
downloadports-04dcdd1a96de2a3c44d1d94d19d80023496eb81c.tar.gz
ports-04dcdd1a96de2a3c44d1d94d19d80023496eb81c.zip
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.
-rw-r--r--Mk/Uses/emacs.mk4
1 files changed, 4 insertions, 0 deletions
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