diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-07 21:25:57 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-07 21:25:57 +0000 |
| commit | 5fe92eb48741d2c283e18bfc8cb3777a730f0fbc (patch) | |
| tree | b86af38870e31a850a0d609d3e9ed811e99da64a /Mk | |
| parent | Fix DISTNAME. (diff) | |
* Add the ability to specify WITH/WITHOUT_GNOME macros with a list of
components to build or not build with. For example:
# make WITHOUT_GNOME=esound
Will build a port that can optionally use esound support, without it.
You can also specify multiple components separated with a space:
# make WITHOUT_GNOME="esound gnomelibs"
The converse is true for WITH_GNOME. Note, that this is backwards
compatible with the old WITH/WITHOUT_GNOME macros. That is,
# make -DWITHOUT_GNOME
Will turn off all optional GNOME components. Also,
# make WITHOUT_GNOME=yes
Will do the same thing.
* Mark a port BROKEN if it includes an unknown GNOME component [1]
PR: 41873 [1]
Submitted by: Edwin Groothuis <edwin@mavetju.org> [1]
Not objected to by: sobomax
Notes
Notes:
svn path=/head/; revision=67580
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnomeng.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Mk/bsd.gnomeng.mk b/Mk/bsd.gnomeng.mk index 341ccab4b946..8c7ece4269dc 100644 --- a/Mk/bsd.gnomeng.mk +++ b/Mk/bsd.gnomeng.mk @@ -224,10 +224,17 @@ libpanel_USE_GNOME_IMPL=gnomelibs _USE_GNOME_SAVED:=${USE_GNOME} HAVE_GNOME?= -.if defined(WANT_GNOME) && !defined(WITHOUT_GNOME) +.if (defined(WANT_GNOME) && !defined(WITHOUT_GNOME)) || \ + (defined(WITHOUT_GNOME) && ${WITHOUT_GNOME}!="yes" && \ + ${WITHOUT_GNOME}!="1") . for component in ${_USE_GNOME_ALL} -. if exists(${${component}_DETECT}) || defined(WITH_GNOME) +. if !defined(WITHOUT_GNOME) || (defined(WITHOUT_GNOME) && \ + ${WITHOUT_GNOME:M${component}}=="") +. if exists(${${component}_DETECT}) || (defined(WITH_GNOME) && \ + (${WITH_GNOME}=="yes" || ${WITH_GNOME:M${component}}!="" || \ + ${WITH_GNOME}=="1")) HAVE_GNOME+= ${component} +. endif . endif . endfor .endif @@ -247,6 +254,9 @@ ${component}_USE_GNOME_IMPL+=${${subcomponent}_USE_GNOME_IMPL} # Then use already expanded USE_GNOME_IMPL to expand USE_GNOME . for component in ${USE_GNOME} +. if ${_USE_GNOME_ALL:M${component}}=="" +BROKEN= "Unknown component ${component}" +. endif _USE_GNOME+= ${${component}_USE_GNOME_IMPL} ${component} . endfor |