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 | fe3c1321bf998d62a4552a591092b48ed03f7428 (patch) | |
| tree | d810c92114f578110af57e0a04897d51e7bceb57 /mk/compiler | |
| parent | 0b69fc27e289d5731e25e95b5792dd9b266a5653 (diff) | |
| download | pkgsrc-fe3c1321bf998d62a4552a591092b48ed03f7428.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/compiler')
| -rw-r--r-- | mk/compiler/f2c.mk | 8 | ||||
| -rw-r--r-- | mk/compiler/gcc.mk | 16 |
2 files changed, 6 insertions, 18 deletions
diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk index 13134219f1e..18e22f59ddc 100644 --- a/mk/compiler/f2c.mk +++ b/mk/compiler/f2c.mk @@ -1,4 +1,4 @@ -# $NetBSD: f2c.mk,v 1.4 2005/01/24 18:20:57 tv Exp $ +# $NetBSD: f2c.mk,v 1.5 2005/03/24 17:46:01 tv Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -96,11 +96,7 @@ PREPEND_PATH+= ${_F2C_DIR}/bin . endif # Add the dependency on f2c. -. if !empty(USE_BUILDLINK3:M[yY][eE][sS]) -. include "../../lang/f2c/buildlink3.mk" -. else -DEPENDS+= f2c>=20001205nb3:../../lang/f2c -. endif +. include "../../lang/f2c/buildlink3.mk" . if defined(F2C_DIR) && !empty(F2C_DIR) BUILD_ENV+= F2C_DIR=${F2C_DIR:Q} diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index 60b47b13a0e..559c4bf4854 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.79 2005/01/21 21:59:14 tv Exp $ +# $NetBSD: gcc.mk,v 1.80 2005/03/24 17:46:01 tv Exp $ .if !defined(COMPILER_GCC_MK) COMPILER_GCC_MK= defined @@ -403,17 +403,9 @@ PREPEND_PATH+= ${_GCC_DIR}/bin # Add the dependency on GCC. .if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) -. if !empty(USE_BUILDLINK3:M[yY][eE][sS]) -. for _dir_ in ${_GCC_PKGSRCDIR} -. include "${_dir_}/buildlink3.mk" -. endfor -. else -. if defined(_USE_GCC_SHLIB) -DEPENDS+= ${_GCC_DEPENDENCY} -. else -BUILD_DEPENDS+= ${_GCC_DEPENDENCY} -. endif -. endif +. for _dir_ in ${_GCC_PKGSRCDIR} +. include "${_dir_}/buildlink3.mk" +. endfor .endif # Create compiler driver scripts in ${WRKDIR}. |