diff options
| author | tv <tv> | 2005-03-24 17:46:00 +0000 |
|---|---|---|
| committer | tv <tv> | 2005-03-24 17:46:00 +0000 |
| commit | becbeb0d92ed90e67235a5d22f77020cb7d29952 (patch) | |
| tree | d810c92114f578110af57e0a04897d51e7bceb57 /mk/bsd.pkg.use.mk | |
| parent | bbdac93695f620db587d57e13966052e8dffd9a5 (diff) | |
| download | pkgsrc-becbeb0d92ed90e67235a5d22f77020cb7d29952.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/bsd.pkg.use.mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 4fc245b04f8..f4c928162f5 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.6 2005/03/22 15:40:06 tv Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.7 2005/03/24 17:46:00 tv Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -22,9 +22,7 @@ PLIST_SUBST+= IMAKE_KERNMAN_SUFFIX=${IMAKE_KERNMAN_SUFFIX} PLIST_SUBST+= IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX} PLIST_SUBST+= IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX} PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX} -. if !empty(USE_BUILDLINK3:M[yY][eE][sS]) -MAKE_FLAGS+= CC="${CC}" CXX="${CXX}" -. endif +MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} .endif .if defined(USE_X11BASE) @@ -189,9 +187,7 @@ RMAN?= ${X11BASE}/bin/rman .if defined(USE_X11) X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX} X11_LDFLAGS+= -L${X11BASE}/lib${LIBABISUFFIX} -. if !empty(USE_BUILDLINK3:M[nN][oO]) LDFLAGS+= ${X11_LDFLAGS} -. endif .endif ### USE_XPKGWEDGE |