diff options
| author | tv <tv@pkgsrc.org> | 2005-03-24 17:46:00 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-03-24 17:46:00 +0000 |
| commit | caaa718c664a2175c0e109dc7355654851713299 (patch) | |
| tree | d810c92114f578110af57e0a04897d51e7bceb57 /mk/tools.mk | |
| parent | 894b223255c10d4814820e05a77501de87ae23e5 (diff) | |
| download | pkgsrc-caaa718c664a2175c0e109dc7355654851713299.tar.gz | |
USE_BUILDLINK3 is no longer optional (and cannot be turned off). Per mail
to tech-pkg:
=====
* USE_BUILDLINK3=YES will be unconditional. (In fact, USE_BUILDLINK3 will
be ignored altogether by mk/; but see below.)
* NO_BUILDLINK and NO_WRAPPER will be ignored by mk/. If a build happens,
these phases will happen.
* The existing NO_BUILD will imply the previous NO_BUILDLINK and NO_WRAPPER.
If no build happens, those phases are not needed.
* NO_TOOLS will be ignored by mk/. The tools phase, which provides much
more than just the C compiler, will always happen regardless of package.
This will make metapackage builds only slightly slower, in trade for far
less user error.
Diffstat (limited to 'mk/tools.mk')
| -rw-r--r-- | mk/tools.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mk/tools.mk b/mk/tools.mk index 30d08af518b..8b7fdba7e95 100644 --- a/mk/tools.mk +++ b/mk/tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.mk,v 1.53 2005/03/21 13:58:22 tv Exp $ +# $NetBSD: tools.mk,v 1.54 2005/03/24 17:46:01 tv Exp $ # # This Makefile creates a ${TOOLS_DIR} directory and populates the bin # subdir with tools that hide the ones outside of ${TOOLS_DIR}. @@ -251,11 +251,7 @@ _TOOLS_OVERRIDE.lex= YES _TOOLS_PROGNAME.lex= ${LEX} .endif .if (${_TOOLS_NEED_GNU.lex} == "YES") && empty(PKGPATH:Mdevel/flex) -.if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) .include "../../devel/flex/buildlink3.mk" -.else -BUILD_DEPENDS+= flex>=2.5:../../devel/flex -.endif _TOOLS_OVERRIDE.lex= YES _TOOLS_PROGNAME.lex= ${LOCALBASE}/bin/flex . if exists(${_TOOLS_PROGNAME.lex}) |