Differential D10327
Implement basic flavors Authored by bapt on Apr 8 2017, 9:09 PM. Tags None Referenced Files
Details
To use them: To define a dependency on a flavor Add FLAVORS support to python Add an example of converting ports to flavor Will be committed in 3 parts:
Diff Detail
Event TimelineComment Actions So, mmm, the last argument of a _DEPENDS line now has two possible meaning, either the target, or the flavor ?
Comment Actions yes it can be a target or a variable (in this case FLAVOR) note that something:origin:target:BLA=something works as well
Comment Actions I had a basic patch for Poudriere to use DEPENDS_ARGS, which was just 1 step away from supporting FLAVORS as well. What was lacking was optimizing it for bulk -a. After recent refactoring of Poudriere's dependency lookup, it should work much better. I will resume working on this soon.
Comment Actions I would like to remove the DEPENDS_ARGS+=PYTHON_VERSION=${PYTHON_VERSION} , it regularly breaks installing from ports some ports that depend on both python2 and python3 (gnome for instance) and the PYTHON_VERSION variable is polluting the build of autotools based ports. Comment Actions We need a standard syntax for specifying an origin with a specific FLAVOR for display and tool purposes. Consider something like 'portmaster devel/py-flake@py33'. RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${FLAVOR}Comment Actions Also, it may be argued that we should use : to retain compatibility with tools that don't know about FLAVORS, so they still build the origin. I think this argument is not valid since the tool would end up building *the wrong package/flavor*. So the tool should rightly break if it doesn't support FLAVORS. Comment Actions FYI I added a PACKAGE_BUILDING_FLAVORS export from Poudriere and am using it, a bit prematurely but it's better than renaming it when this is committed, in rP442592.
Comment Actions Some thing we need to do (which I will soon move to a FlavorsTODO wiki) Before commit:
Anytime:
Comment Actions FYI Poudriere git master now has FLAVORS support. You'll need the PORTS_FEATURES+= FLAVORS and the do-depends.sh change I showed here.
Comment Actions
Comment Actions This comment has been deleted.
Comment Actions This breaks make index make_index: /usr/ports/devel/py-clint: no entry for /usr/ports/devel/py-args@python2 Comment Actions Adding some @ somewhere in this part of Mk/bsd.port.mk may help _EXTRACT_DEPENDS=${EXTRACT_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
_PATCH_DEPENDS=${PATCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
_FETCH_DEPENDS=${FETCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
_LIB_DEPENDS=${LIB_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
_BUILD_DEPENDS=${BUILD_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS}
_RUN_DEPENDS=${RUN_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS}Comment Actions This fixes the issue for me: --- Mk/bsd.port.mk.patched 2017-07-31 16:53:43.492857000 +0000 +++ Mk/bsd.port.mk 2017-08-03 08:35:05.637010000 +0000 @@ -4265,12 +4265,12 @@ # first to avoid gratuitous breakage. . if !target(describe) -_EXTRACT_DEPENDS=${EXTRACT_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} -_PATCH_DEPENDS=${PATCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} -_FETCH_DEPENDS=${FETCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} -_LIB_DEPENDS=${LIB_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} -_BUILD_DEPENDS=${BUILD_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} -_RUN_DEPENDS=${RUN_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} +_EXTRACT_DEPENDS=${EXTRACT_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} +_PATCH_DEPENDS=${PATCH_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} +_FETCH_DEPENDS=${FETCH_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} +_LIB_DEPENDS=${LIB_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} +_BUILD_DEPENDS=${BUILD_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} +_RUN_DEPENDS=${RUN_DEPENDS:C/^[^ :]+:([^ :@]+)(@[^ :]+)?(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS} . if exists(${DESCR}) _DESCR=${DESCR} . else Comment Actions Before this goes in, we need helpers for pkgnameprefix/suffix, and conflicts* because while the python ports take care of it, other ports will not. | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||