diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-05-29 21:30:56 +0800 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-05-29 21:30:56 +0800 |
| commit | 4ab2fee3090c6b58ec4839578e6eddcd2b6877a2 (patch) | |
| tree | faaa711ecdaeb0f47eaef5f016113b9873ec3ce7 /Mk/bsd.options.mk | |
| parent | ed3d7031d5def245e3f238f4bf4ed690b26a57f6 (diff) | |
| download | freebsd-ports-gnome-4ab2fee3090c6b58ec4839578e6eddcd2b6877a2.tar.gz freebsd-ports-gnome-4ab2fee3090c6b58ec4839578e6eddcd2b6877a2.tar.zst freebsd-ports-gnome-4ab2fee3090c6b58ec4839578e6eddcd2b6877a2.zip | |
Fix python's make config [1]
Better backward compatibility [2]
Reported by: ketas (on #bsdports) [1], flo@ [2]
Tested by: flo@ [2]
Diffstat (limited to 'Mk/bsd.options.mk')
| -rw-r--r-- | Mk/bsd.options.mk | 45 |
1 files changed, 9 insertions, 36 deletions
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk index a8aa25c8c6c8..c7f42bdf7b76 100644 --- a/Mk/bsd.options.mk +++ b/Mk/bsd.options.mk @@ -145,43 +145,16 @@ WITHOUT_NLS= yes .endif ### to be removed once old OPTIONS disappear -.if defined(OPTIONS) -# include OPTIONSFILE first if exists -. if exists(${OPTIONSFILE}) && !make(rmconfig) -. include "${OPTIONSFILE}" -. endif -. if exists(${OPTIONSFILE}.local) -. include "${OPTIONSFILE}.local" -. endif -WITHOUT:= -WITH:= -. if defined(OPTIONS) -REALOPTIONS=${OPTIONS:C/".*"//g} -. for O in ${REALOPTIONS} -RO:=${O} -. if ${RO:L} == off -WITHOUT:= ${WITHOUT} ${OPT} -. endif -. if ${RO:L} == on -WITH:= ${WITH} ${OPT} -. endif -OPT:=${RO} -. endfor -. endif -# define only if NO WITH/WITHOUT_${W} is defined -. for W in ${WITH} -. if !defined(WITH_${W}) && !defined(WITHOUT_${W}) -WITH_${W}:= true +.for opt in ${ALL_OPTIONS} +.if empty(PORT_OPTIONS:M${opt}) +. if !defined(WITH_${opt}) && !defined(WITHOUT_${opt}) +WITHOUT_${opt}:= true . endif -. endfor -. for W in ${WITHOUT} -. if !defined(WITH_${W}) && !defined(WITHOUT_${W}) -WITHOUT_${W}:= true +.else +. if !defined(WITH_${opt}) && !defined(WITHOUT_${opt}) +WITH_${opt}:= true . endif -. endfor -. undef WITH -. undef WITHOUT -. undef RO -. undef REALOPTIONS .endif +. undef opt +.endfor ### |