From b9177e774988930983450205b7ad45b8cd1b36d2 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 18 Mar 2004 04:19:39 +0000 Subject: Rename the internal package variable referred to by buildlink[23]. No functional change. --- lang/gcc3-f77/buildlink2.mk | 30 +++++++++++++++--------------- lang/gcc3-f77/buildlink3.mk | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) (limited to 'lang/gcc3-f77') diff --git a/lang/gcc3-f77/buildlink2.mk b/lang/gcc3-f77/buildlink2.mk index 41911e3d703..62600d1fde8 100644 --- a/lang/gcc3-f77/buildlink2.mk +++ b/lang/gcc3-f77/buildlink2.mk @@ -1,36 +1,36 @@ -# $NetBSD: buildlink2.mk,v 1.2 2004/03/01 11:39:58 markd Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2004/03/18 04:19:39 jlam Exp $ -.if !defined(GCC3F77_BUILDLINK2_MK) -GCC3F77_BUILDLINK2_MK= # defined +.if !defined(GCC3_F77_BUILDLINK2_MK) +GCC3_F77_BUILDLINK2_MK= # defined .include "../../mk/bsd.prefs.mk" .if defined(GCC3_INSTALLTO_SUBPREFIX) GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} .endif -BUILDLINK_PACKAGES+= gcc3f77 -BUILDLINK_DEPENDS.gcc3f77?= gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD} -BUILDLINK_PKGSRCDIR.gcc3f77?= ../../lang/gcc3-f77 +BUILDLINK_PACKAGES+= gcc3-f77 +BUILDLINK_DEPENDS.gcc3-f77?= gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD} +BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77 # Packages that link against gcc shared libraries need a full # dependency. # .if defined(USE_GCC_SHLIB) -BUILDLINK_DEPMETHOD.gcc3f77+= full +BUILDLINK_DEPMETHOD.gcc3-f77+= full .else -BUILDLINK_DEPMETHOD.gcc3f77?= build +BUILDLINK_DEPMETHOD.gcc3-f77?= build .endif -BUILDLINK_PREFIX.gcc3f77= ${LOCALBASE} +BUILDLINK_PREFIX.gcc3-f77= ${LOCALBASE} BUILDLINK_WRAPPER_ENV+= \ COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH -BUILDLINK_FILES.gcc3f77= ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/g2c.h -BUILDLINK_FILES.gcc3f77+= ${_GCC_SUBPREFIX}lib/libfrtbegin.* -BUILDLINK_FILES.gcc3f77+= ${_GCC_SUBPREFIX}lib/libg2c.* +BUILDLINK_FILES.gcc3-f77= ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/g2c.h +BUILDLINK_FILES.gcc3-f77+= ${_GCC_SUBPREFIX}lib/libfrtbegin.* +BUILDLINK_FILES.gcc3-f77+= ${_GCC_SUBPREFIX}lib/libg2c.* -BUILDLINK_TARGETS+= gcc3f77-buildlink +BUILDLINK_TARGETS+= gcc3-f77-buildlink -gcc3f77-buildlink: _BUILDLINK_USE +gcc3-f77-buildlink: _BUILDLINK_USE -.endif # GCC3F77_BUILDLINK2_MK +.endif # GCC3_F77_BUILDLINK2_MK diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk index 9e531a2cffd..d0fb0605932 100644 --- a/lang/gcc3-f77/buildlink3.mk +++ b/lang/gcc3-f77/buildlink3.mk @@ -1,36 +1,36 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC3F77_BUILDLINK3_MK:= ${GCC3F77_BUILDLINK3_MK}+ +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GCC3_F77_BUILDLINK3_MK:= ${GCC3_F77_BUILDLINK3_MK}+ .include "../../mk/bsd.prefs.mk" .if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc3f77 +BUILDLINK_DEPENDS+= gcc3-f77 .endif -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3f77} -BUILDLINK_PACKAGES+= gcc3f77 +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3-f77} +BUILDLINK_PACKAGES+= gcc3-f77 -.if !empty(GCC3F77_BUILDLINK3_MK:M+) +.if !empty(GCC3_F77_BUILDLINK3_MK:M+) . if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif . endif -BUILDLINK_PKGBASE.gcc3f77?= gcc3${GCC3_PKGMODIF}-f77 -BUILDLINK_DEPENDS.gcc3f77+= gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD} -BUILDLINK_PKGSRCDIR.gcc3f77?= ../../lang/gcc3-f77 -BUILDLINK_LIBDIRS.gcc3f77?= \ - lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3f77}\///} +BUILDLINK_PKGBASE.gcc3-f77?= gcc3${GCC3_PKGMODIF}-f77 +BUILDLINK_DEPENDS.gcc3-f77+= gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD} +BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77 +BUILDLINK_LIBDIRS.gcc3-f77?= \ + lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///} # Packages that link against shared libraries need a full dependency. .if defined(USE_GCC_SHLIB) -BUILDLINK_DEPMETHOD.gcc3f77+= full +BUILDLINK_DEPMETHOD.gcc3-f77+= full .else -BUILDLINK_DEPMETHOD.gcc3f77?= build +BUILDLINK_DEPMETHOD.gcc3-f77?= build .endif -.endif # GCC3F77_BUILDLINK3_MK +.endif # GCC3_F77_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3