Page MenuHomeFreeBSD
Files F162232430

D10327.id30783.diff
No OneTemporary
Actions

D10327.id30783.diff
View Options

Index: Mk/Scripts/depends-list.sh
===================================================================
--- Mk/Scripts/depends-list.sh
+++ Mk/Scripts/depends-list.sh
@@ -59,8 +59,13 @@
IFS=${myifs}
case "${2}" in
- /*) d=${2} ;;
- *) d=${PORTSDIR}/${2} ;;
+ /*) d=${2} ;;
+ *) d=${PORTSDIR}/${2} ;;
+ esac
+
+ case "${d}" in
+ *@*/*) ;; # Ignore @ in the path which would not be a flavor
+ *@*) d=${d%@*} ;;
esac
case " ${checked} " in
Index: Mk/Scripts/do-depends.sh
===================================================================
--- Mk/Scripts/do-depends.sh
+++ Mk/Scripts/do-depends.sh
@@ -94,13 +94,15 @@
anynotfound=0
err=0
for _line in ${dp_RAWDEPENDS} ; do
+ # ensure we never leak flavors
+ unset FLAVOR
myifs=${IFS}
IFS=:
set -- ${_line}
IFS=${myifs}
if [ $# -lt 2 -o $# -gt 3 ]; then
echo "Error: bad dependency syntax in ${dp_DEPTYPE}" >&2
- echo "expecting: pattern:origin[:target]" >&2
+ echo "expecting: pattern:origin[@flavour][:target]" >&2
echo "got: ${_line}" >&2
err=1
continue
@@ -125,6 +127,13 @@
/*) ;;
*) origin="${PORTSDIR}/${origin}" ;;
esac
+ case "${origin}" in
+ *@*/*) ;; # Ignore @ in the path which would not be a flavor
+ *@*)
+ export FLAVOR="${origin##*@}"
+ origin=${origin%@*}
+ ;;
+ esac
depends_args="${dp_DEPENDS_ARGS}"
target=${dp_DEPENDS_TARGET}
Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -307,6 +307,12 @@
PYTHON3_DEFAULT_VERSION?= python${PYTHON3_DEFAULT}
.endif
+.if ${FLAVOR} == python2
+_PYTHON_ARGS= 2
+.elif ${FLAVOR} == python3
+_PYTHON_ARGS= 3
+.endif
+
.if ${_PYTHON_ARGS} == "2"
_PYTHON_ARGS= ${PYTHON2_DEFAULT_VERSION:S/^python//}
_WANTS_META_PORT= 2
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1056,6 +1056,9 @@
LIB_DIRS?= /lib /usr/lib ${LOCALBASE}/lib
STAGEDIR?= ${WRKDIR}/stage
NOTPHONY?=
+FLAVORS?=
+FLAVOR?=
+PORTS_FEATURES+= FLAVORS
MINIMAL_PKG_VERSION= 1.6.0
_PORTS_DIRECTORIES+= ${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} \
@@ -1066,6 +1069,21 @@
.include "${PORTSDIR}/Mk/bsd.commands.mk"
+.if !empty(FLAVOR)
+. if empty(FLAVORS)
+IGNORE= FLAVOR is defined while this port does not have FLAVORS.
+. elif ! ${FLAVORS:M${FLAVOR}}
+IGNORE= Unknown flavor '${FLAVOR}', possible flavors: ${FLAVORS}.
+. endif
+.endif
+
+.if !empty(FLAVORS) && empty(FLAVOR)
+FLAVOR= ${FLAVORS:[1]}
+.endif
+
+# Do not leak flavors to childs make
+.MAKEOVERRIDES:= ${MAKEOVERRIDES:NFLAVOR=*}
+
.if defined(CROSS_TOOLCHAIN)
.if !defined(CROSS_SYSROOT)
IGNORE= CROSS_SYSROOT should be defined
@@ -1503,6 +1521,11 @@
PKG_NOTE_expiration_date= ${EXPIRATION_DATE}
.endif
+.if !empty(FLAVOR)
+PKG_NOTES+= flavor
+PKG_NOTE_flavor= ${FLAVOR}
+.endif
+
TEST_ARGS?= ${MAKE_ARGS}
TEST_ENV?= ${MAKE_ENV}
@@ -1570,7 +1593,13 @@
CONFIGURE_ENV+= PKG_CONFIG_SYSROOT_DIR="${CROSS_SYSROOT}"
.endif
-WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
+.if empty(FLAVOR)
+_WRKDIR= work
+.else
+_WRKDIR= work-${FLAVOR}
+.endif
+
+WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/${_WRKDIR}
.if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) && empty(USE_GITHUB:Mnodefault)
WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
.endif
@@ -3660,18 +3689,57 @@
.endif
.if !target(clean)
-clean:
+pre-clean: clean-msg
+clean-msg:
+ @${ECHO_MSG} "===> Cleaning for ${PKGNAME}"
+
+.if empty(FLAVORS)
+CLEAN_DEPENDENCIES=
.if !defined(NOCLEANDEPENDS)
+CLEAN_DEPENDENCIES+= limited-clean-depends-noflavor
+limited-clean-depends-noflavor:
@cd ${.CURDIR} && ${MAKE} limited-clean-depends
.endif
- @${ECHO_MSG} "===> Cleaning for ${PKGNAME}"
.if target(pre-clean)
- @cd ${.CURDIR} && ${MAKE} pre-clean
+CLEAN_DEPENDENCIES+= pre-clean-noflavor
+pre-clean-noflavor:
+ @cd ${.CURDIR} && ${SETENV} ${MAKE} pre-clean
+.endif
+CLEAN_DEPENDENCIES+= do-clean-noflavor
+do-clean-noflavor:
+ @cd ${.CURDIR} && ${SETENV} ${MAKE} do-clean
+.if target(post-clean)
+CLEAN_DEPENDENCIES+= post-clean-noflavor
+post-clean-${_f}:
+ @cd ${.CURDIR} && ${SETENV} ${MAKE} post-clean
+.endif
+.ORDER: ${CLEAN_DEPENDENCIES}
+clean: ${CLEAN_DEPENDENCIES}
+.endif
+
+.for _f in ${FLAVORS}
+CLEAN_DEPENDENCIES=
+.if !defined(NOCLEANDEPENDS)
+CLEAN_DEPENDENCIES+= limited-clean-depends-${_f}
+limited-clean-depends-${_f}:
+ @cd ${.CURDIR} && ${MAKE} FLAVOR=${_f} limited-clean-depends
+.endif
+.if target(pre-clean)
+CLEAN_DEPENDENCIES+= pre-clean-${_f}
+pre-clean-${_f}:
+ @cd ${.CURDIR} && ${SETENV} FLAVOR=${_f} ${MAKE} pre-clean
.endif
- @cd ${.CURDIR} && ${MAKE} do-clean
+CLEAN_DEPENDENCIES+= do-clean-${_f}
+do-clean-${_f}:
+ @cd ${.CURDIR} && ${SETENV} FLAVOR=${_f} ${MAKE} do-clean
.if target(post-clean)
- @cd ${.CURDIR} && ${MAKE} post-clean
+CLEAN_DEPENDENCIES+= post-clean-${_f}
+post-clean-${_f}:
+ @cd ${.CURDIR} && ${SETENV} FLAVOR=${_f} ${MAKE} post-clean
.endif
+.ORDER: ${CLEAN_DEPENDENCIES}
+clean: ${CLEAN_DEPENDENCIES}
+.endfor
.endif
.if !target(distclean)
Index: devel/py-args/Makefile
===================================================================
--- devel/py-args/Makefile
+++ devel/py-args/Makefile
@@ -16,4 +16,6 @@
USES= python
USE_PYTHON= distutils autoplist
+FLAVORS= python2 python3
+
.include <bsd.port.mk>
Index: devel/py-clint/Makefile
===================================================================
--- devel/py-clint/Makefile
+++ devel/py-clint/Makefile
@@ -13,7 +13,9 @@
LICENSE= ISCL
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args
+FLAVORS= python2 python3
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils

File Metadata

Mime Type
text/plain
Expires
Sun, Jul 12, 3:50 AM (9 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34985325
Default Alt Text
D10327.id30783.diff (5 KB)

Event Timeline