Page MenuHomeFreeBSD
Files F137923757

D12483.id34455.diff
No OneTemporary
Actions

D12483.id34455.diff
View Options

Index: Mk/bsd.options.mk
===================================================================
--- Mk/bsd.options.mk
+++ Mk/bsd.options.mk
@@ -173,6 +173,11 @@
OPTIONSMKINCLUDED= bsd.options.mk
OPTIONS_NAME?= ${PKGORIGIN:S/\//_/}
+# If there is a FLAVOR and it is not the default one, append it to OPTIONS_NAME
+# so that the options can be different than the default flavor.
+.if !empty(FLAVOR) && ${FLAVOR} != ${FLAVORS:[1]}
+OPTIONS_NAME:= ${OPTIONS_NAME}@${FLAVOR}
+.endif
OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options
_OPTIONS_FLAGS= ALL_TARGET BROKEN CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1084,6 +1084,31 @@
# Do not leak flavors to childs make
.MAKEOVERRIDES:= ${MAKEOVERRIDES:NFLAVOR=*}
+.if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
+_DID_FLAVORS_HELPERS= yes
+# These overwrite the current value
+.for v in PKGNAMEPREFIX PKGNAMESUFFIX PLIST DESCR
+.if defined(${FLAVOR}_${v})
+${v}= ${${FLAVOR}_${v}}
+.endif
+.endfor
+
+# These append to the current value
+.for v in CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \
+ PKG_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS FETCH_DEPENDS BUILD_DEPENDS \
+ LIB_DEPENDS RUN_DEPENDS TEST_DEPENDS
+.if defined(${FLAVOR}_${v})
+${v}+= ${${FLAVOR}_${v}}
+.endif
+.endfor
+
+.for v in BROKEN IGNORE
+.if defined(${FLAVOR}_${v})
+${v}= flavor "${FLAVOR}" ${${FLAVOR}_${v}}
+.endif
+.endfor
+.endif # defined(${FLAVOR})
+
.if defined(CROSS_TOOLCHAIN)
.if !defined(CROSS_SYSROOT)
IGNORE= CROSS_SYSROOT should be defined

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 28, 7:24 AM (5 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26277312
Default Alt Text
D12483.id34455.diff (1 KB)

Event Timeline