diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-11-25 13:05:47 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-11-25 13:05:47 +0000 |
| commit | 8a7ccd8b02f850a24ebe4f7ed9d6c31604090867 (patch) | |
| tree | 2ab9b04734701c7c78846e3c50b14172386cba11 /mk/compiler/f2c.mk | |
| parent | 2ce2ce8165a7519d5bc876babe0477e798d4404c (diff) | |
| download | pkgsrc-8a7ccd8b02f850a24ebe4f7ed9d6c31604090867.tar.gz | |
Remove mk/find-prefix.mk and its usage from the mk infrastructure.
The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.
Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.
Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.
Diffstat (limited to 'mk/compiler/f2c.mk')
| -rw-r--r-- | mk/compiler/f2c.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk index b793e5069f0..4e0dfeb0315 100644 --- a/mk/compiler/f2c.mk +++ b/mk/compiler/f2c.mk @@ -1,4 +1,4 @@ -# $NetBSD: f2c.mk,v 1.16 2013/05/09 23:37:26 riastradh Exp $ +# $NetBSD: f2c.mk,v 1.17 2015/11/25 13:05:47 jperkin Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -60,9 +60,6 @@ _USE_F2C= YES .if !empty(_USE_F2C:M[yY][eE][sS]) USE_LANGUAGES+= c -EVAL_PREFIX+= _F2CBASE=f2c -_F2CBASE_DEFAULT= ${LOCALBASE} - _F2C_DIR= ${WRKDIR}/.f2c _F2C_VARS= # empty . if !empty(_LANGUAGES.f2c:Mfortran) || !empty(_LANGUAGES.f2c:Mfortran77) @@ -70,7 +67,7 @@ PKG_FC?= ${FC} _F2C_VARS+= FC _F2C_FC:= ${_F2C_DIR}/bin/${PKG_FC:T} _ALIASES.FC+= f77 g77 f2c-f77 -FCPATH= ${_F2CBASE}/bin/f2c-f77 +FCPATH= ${LOCALBASE}/bin/f2c-f77 PKG_FC:= ${_F2C_FC} # # The f2c-f77 shell script invokes the C compiler, so ensure that it finds @@ -121,11 +118,11 @@ override-tools: ${_F2C_${_var_}} ${_F2C_${_var_}}: ${RUN}${MKDIR} ${.TARGET:H} ${RUN} \ - ${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${.TARGET} + ${LN} -fs ${LOCALBASE}/bin/f2c-f77 ${.TARGET} . for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//} ${RUN} \ if [ ! -x "${_alias_}" ]; then \ - ${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${_alias_}; \ + ${LN} -fs ${LOCALBASE}/bin/f2c-f77 ${_alias_}; \ fi . endfor . endif |