Page MenuHomeFreeBSD
Files F142763917

D12483.id.diff
No OneTemporary
Actions

D12483.id.diff
View Options

Index: head/CHANGES
===================================================================
--- head/CHANGES
+++ head/CHANGES
@@ -13,6 +13,28 @@
20171130:
AUTHOR: mat@FreeBSD.org
+ To help with flavored ports, helpers are available. In these, replace <*>
+ with the flavor name.
+
+ *_PKGNAMEPREFIX *_PKGNAMESUFFIX *_PLIST *_DESCR will overwrite the variable.
+
+ *_CONFLICTS *_CONFLICTS_BUILD *_CONFLICTS_INSTALL *_PKG_DEPENDS
+ *_EXTRACT_DEPENDS *_PATCH_DEPENDS *_FETCH_DEPENDS *_BUILD_DEPENDS
+ *_LIB_DEPENDS *_RUN_DEPENDS *_TEST_DEPENDS will append to the variable.
+
+ For example:
+
+ flavor2_PKGNAMESUFFIX= -foo
+
+ can replace:
+
+ .if ${FLAVOR:U} == flavor2
+ PKGNAMESUFFIX= -foo
+ .endif
+
+20171130:
+AUTHOR: mat@FreeBSD.org
+
Flavors are a way to have multiple variations of a port. The port is built
multiple times, with the variations. To declare flavors, set the FLAVORS
variable to the flavors you want defined. The first flavor will be the
Index: head/Mk/bsd.port.mk
===================================================================
--- head/Mk/bsd.port.mk
+++ head/Mk/bsd.port.mk
@@ -1084,6 +1084,34 @@
# Do not leak flavors to childs make
.MAKEOVERRIDES:= ${MAKEOVERRIDES:NFLAVOR=*}
+.if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
+_DID_FLAVORS_HELPERS= yes
+_FLAVOR_HELPERS_OVERRIDE= DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX
+_FLAVOR_HELPERS_APPEND= CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \
+ PKG_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS \
+ FETCH_DEPENDS BUILD_DEPENDS LIB_DEPENDS \
+ RUN_DEPENDS TEST_DEPENDS
+# These overwrite the current value
+.for v in ${_FLAVOR_HELPERS_OVERRIDE}
+.if defined(${FLAVOR}_${v})
+${v}= ${${FLAVOR}_${v}}
+.endif
+.endfor
+
+# These append to the current value
+.for v in ${_FLAVOR_HELPERS_APPEND}
+.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
Sat, Jan 24, 7:49 AM (12 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27895052
Default Alt Text
D12483.id.diff (2 KB)

Event Timeline