Replace all references to _GCC_REQD with the appropriate logical value for

each GCC version.  Using the variable causes impossible version constraints
when a specific GCC is depended upon but the user is using something newer,
as _GCC_REQD will be set to the higher value.

14 files changed, 32 insertions, 32 deletions

diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk
index 443f1067f7d..01aef5ca429 100644
--- a/lang/gcc/buildlink3.mk
+++ b/lang/gcc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2012/05/07 01:53:39 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2014/09/06 08:20:28 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	gcc
 .if !defined(GCC_BUILDLINK3_MK)
 GCC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gcc+=		gcc>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc+=		gcc>=2.95
 BUILDLINK_ABI_DEPENDS.gcc+=	gcc>=2.95.3nb7
 BUILDLINK_PKGSRCDIR.gcc?=	../../lang/gcc
 BUILDLINK_LIBDIRS.gcc?=		\
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index 8690798e36e..b4b391ce825 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2012/05/07 01:53:40 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:28 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -12,7 +12,7 @@ GCC3_CXX_BUILDLINK3_MK:=
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_API_DEPENDS.gcc3-cxx+=	gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc3-cxx+=	gcc3${GCC3_PKGMODIF}-c++>=3.0
 BUILDLINK_ABI_DEPENDS.gcc3-cxx+=	gcc3-c++>=3.3.5nb1
 BUILDLINK_PKGSRCDIR.gcc3-cxx?=	../../lang/gcc3-c++
 BUILDLINK_LIBDIRS.gcc3-cxx?=	\
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 75c692fd73a..b27200ec848 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2014/09/06 08:20:29 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -17,7 +17,7 @@ GCC3_C_BUILDLINK3_MK:=
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_API_DEPENDS.gcc3-c+=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc3-c+=	gcc3${GCC3_PKGMODIF}-c>=3.0
 BUILDLINK_ABI_DEPENDS.gcc3-c+=	gcc3-c>=3.3.5nb1
 BUILDLINK_PKGSRCDIR.gcc3-c?=	../../lang/gcc3-c
 BUILDLINK_GCC3_LIBDIRS=		lib
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index 2e4703d85d5..6bf5861f397 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2012/05/07 01:53:40 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:29 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -12,7 +12,7 @@ GCC3_F77_BUILDLINK3_MK:=
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_API_DEPENDS.gcc3-f77+=	gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc3-f77+=	gcc3${GCC3_PKGMODIF}-f77>=3.0
 BUILDLINK_ABI_DEPENDS.gcc3-f77+=	gcc3-f77>=3.3.5nb2
 BUILDLINK_PKGSRCDIR.gcc3-f77?=	../../lang/gcc3-f77
 BUILDLINK_LIBDIRS.gcc3-f77?=	\
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index 559d8d9a7e0..6ed138bcfe3 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2012/05/07 01:53:40 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:29 jperkin Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -12,7 +12,7 @@ GCC3_OBJC_BUILDLINK3_MK:=
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_API_DEPENDS.gcc3-objc+=	gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc3-objc+=	gcc3${GCC3_PKGMODIF}-objc>=3.0
 BUILDLINK_ABI_DEPENDS.gcc3-objc+=	gcc3-objc>=3.3.5nb1
 BUILDLINK_PKGSRCDIR.gcc3-objc?=	../../lang/gcc3-objc
 BUILDLINK_LIBDIRS.gcc3-objc?=	\
diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk
index 57cac4c69cb..b4ab92bb916 100644
--- a/lang/gcc34/buildlink3.mk
+++ b/lang/gcc34/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2013/04/06 11:06:52 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2014/09/06 08:20:29 jperkin Exp $
 
 BUILDLINK_TREE+=	gcc34
 
@@ -11,7 +11,7 @@ FIND_PREFIX:=	BUILDLINK_PREFIX.gcc34=gcc34
 _GCC34_SUBDIR=	gcc34
 _GCC34_PREFIX=	${BUILDLINK_PREFIX.gcc34}/${_GCC34_SUBDIR}
 
-BUILDLINK_API_DEPENDS.gcc34+=	gcc34>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc34+=	gcc34>=3.4
 BUILDLINK_ABI_DEPENDS.gcc34+=	gcc34>=3.4.6nb4
 BUILDLINK_PKGSRCDIR.gcc34?=	../../lang/gcc34
 
diff --git a/lang/gcc44/buildlink3.mk b/lang/gcc44/buildlink3.mk
index 70f096694df..07cb61a4c96 100644
--- a/lang/gcc44/buildlink3.mk
+++ b/lang/gcc44/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2013/04/06 11:06:52 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2014/09/06 08:20:29 jperkin Exp $
 
 BUILDLINK_TREE+=	gcc44
 
@@ -11,7 +11,7 @@ FIND_PREFIX:=	BUILDLINK_PREFIX.gcc44=gcc44
 _GCC44_SUBDIR=	gcc44
 _GCC44_PREFIX=	${BUILDLINK_PREFIX.gcc44}/${_GCC44_SUBDIR}
 
-BUILDLINK_API_DEPENDS.gcc44+=	gcc44>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc44+=	gcc44>=4.4
 BUILDLINK_ABI_DEPENDS.gcc44+=	gcc44>=4.4.5nb2
 BUILDLINK_PKGSRCDIR.gcc44?=	../../lang/gcc44
 
diff --git a/lang/gcc45/buildlink3.mk b/lang/gcc45/buildlink3.mk
index ec8bebf99b3..d8d10f67b46 100644
--- a/lang/gcc45/buildlink3.mk
+++ b/lang/gcc45/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2013/04/06 11:06:52 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2014/09/06 08:20:29 jperkin Exp $
 
 BUILDLINK_TREE+=	gcc45
 
@@ -11,7 +11,7 @@ FIND_PREFIX:=	BUILDLINK_PREFIX.gcc45=gcc45
 _GCC45_SUBDIR=	gcc45
 _GCC45_PREFIX=	${BUILDLINK_PREFIX.gcc45}/${_GCC45_SUBDIR}
 
-BUILDLINK_API_DEPENDS.gcc45+=	gcc45>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc45+=	gcc45>=4.5
 BUILDLINK_ABI_DEPENDS.gcc45+=	gcc45>=4.5.0
 BUILDLINK_PKGSRCDIR.gcc45?=	../../lang/gcc45
 
diff --git a/lang/gcc46/buildlink3.mk b/lang/gcc46/buildlink3.mk
index 9fe4cf1fed3..e98ff009317 100644
--- a/lang/gcc46/buildlink3.mk
+++ b/lang/gcc46/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2013/04/06 11:06:52 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2014/09/06 08:20:29 jperkin Exp $
 
 BUILDLINK_TREE+=	gcc46
 
@@ -11,7 +11,7 @@ FIND_PREFIX:=	BUILDLINK_PREFIX.gcc46=gcc46
 _GCC46_SUBDIR=	gcc46
 _GCC46_PREFIX=	${BUILDLINK_PREFIX.gcc46}/${_GCC46_SUBDIR}
 
-BUILDLINK_API_DEPENDS.gcc46+=	gcc46>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc46+=	gcc46>=4.6
 BUILDLINK_ABI_DEPENDS.gcc46+=	gcc46>=4.6.0
 BUILDLINK_PKGSRCDIR.gcc46?=	../../lang/gcc46
 
diff --git a/lang/gcc47/buildlink3.mk b/lang/gcc47/buildlink3.mk
index bca446c8d33..07f32313634 100644
--- a/lang/gcc47/buildlink3.mk
+++ b/lang/gcc47/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2013/01/31 23:34:21 hans Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2014/09/06 08:20:29 jperkin Exp $
 
 BUILDLINK_TREE+=	gcc47
 
 .if !defined(GCC47_BUILDLINK3_MK)
 GCC47_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gcc47+=	gcc47>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc47+=	gcc47>=4.7
 BUILDLINK_ABI_DEPENDS.gcc47+=	gcc47>=4.7.0
 BUILDLINK_PKGSRCDIR.gcc47=	../../lang/gcc47
 BUILDLINK_DEPMETHOD.gcc47?=	build
@@ -19,7 +19,7 @@ BUILDLINK_AUTO_VARS.gcc47=	no
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(_USE_GCC_SHLIB)
-DEPENDS+=	{gcc47,gcc47-libs}>=${_GCC_REQD}:../../lang/gcc47-libs
+DEPENDS+=	{gcc47,gcc47-libs}>=4.7:../../lang/gcc47-libs
 ABI_DEPENDS+=	{gcc47,gcc47-libs}>=4.7.0:../../lang/gcc47-libs
 .endif
 
diff --git a/lang/gcc48-cc++/buildlink3.mk b/lang/gcc48-cc++/buildlink3.mk
index fe0570aaa4b..2f579284990 100644
--- a/lang/gcc48-cc++/buildlink3.mk
+++ b/lang/gcc48-cc++/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/09/05 21:41:45 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2014/09/06 08:20:29 jperkin Exp $
 
 BUILDLINK_TREE+=	gcc48-cc++
 
 .if !defined(GCC48_CC++_BUILDLINK3_MK)
 GCC48_CC++_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gcc48-cc+++=	gcc48-cc++>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc48-cc+++=	gcc48-cc++>=4.8
 BUILDLINK_PKGSRCDIR.gcc48-cc++?=	../../lang/gcc48-cc++
 
 BUILDLINK_GCC48_LIBDIRS=		gcc48/lib
diff --git a/lang/gcc48-fortran/buildlink3.mk b/lang/gcc48-fortran/buildlink3.mk
index 501ef260dd2..914bc9ee4d0 100644
--- a/lang/gcc48-fortran/buildlink3.mk
+++ b/lang/gcc48-fortran/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/06/01 08:11:13 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2014/09/06 08:20:29 jperkin Exp $
 
 BUILDLINK_TREE+=	gcc48-fortran
 
 .if !defined(GCC48_FORTRAN_BUILDLINK3_MK)
 GCC48_FORTRAN_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gcc48-fortran+=	gcc48-fortran>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc48-fortran+=	gcc48-fortran>=4.8
 BUILDLINK_PKGSRCDIR.gcc48-fortran?=	../../lang/gcc48-fortran
 
 BUILDLINK_GCC48_LIBDIRS=		gcc48/lib
@@ -15,7 +15,7 @@ BUILDLINK_DEPMETHOD.gcc48-fortran?=	build
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(_USE_GCC_SHLIB)
-DEPENDS+=	gcc48-libs>=${_GCC_REQD}:../../lang/gcc48-libs
+DEPENDS+=	gcc48-libs>=4.8:../../lang/gcc48-libs
 ABI_DEPENDS+=	gcc48-libs>=4.8.0:../../lang/gcc48-libs
 .endif
 
diff --git a/lang/gcc48-objc/buildlink3.mk b/lang/gcc48-objc/buildlink3.mk
index dde72505e73..b176b47f960 100644
--- a/lang/gcc48-objc/buildlink3.mk
+++ b/lang/gcc48-objc/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/06/01 08:11:13 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2014/09/06 08:20:29 jperkin Exp $
 
 BUILDLINK_TREE+=	gcc48-objc
 
 .if !defined(GCC48_OBJC_BUILDLINK3_MK)
 GCC48_OBJC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gcc48-objc+=	gcc48-objc>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc48-objc+=	gcc48-objc>=4.8
 BUILDLINK_PKGSRCDIR.gcc48-objc?=	../../lang/gcc48-objc
 
 BUILDLINK_GCC48_LIBDIRS=		gcc48/lib
@@ -15,7 +15,7 @@ BUILDLINK_DEPMETHOD.gcc48-objc?=	build
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(_USE_GCC_SHLIB)
-DEPENDS+=	gcc48-libs>=${_GCC_REQD}:../../lang/gcc48-libs
+DEPENDS+=	gcc48-libs>=4.8:../../lang/gcc48-libs
 ABI_DEPENDS+=	gcc48-libs>=4.8.0:../../lang/gcc48-libs
 .endif
 
diff --git a/lang/gcc49/buildlink3.mk b/lang/gcc49/buildlink3.mk
index 74dc2a0e8a4..ac1cb5a15b0 100644
--- a/lang/gcc49/buildlink3.mk
+++ b/lang/gcc49/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/09/04 18:43:11 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2014/09/06 08:20:29 jperkin Exp $
 
 BUILDLINK_TREE+=	gcc49
 
 .if !defined(GCC49_BUILDLINK3_MK)
 GCC49_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gcc49+=	gcc49>=${_GCC_REQD}
+BUILDLINK_API_DEPENDS.gcc49+=	gcc49>=4.9
 BUILDLINK_ABI_DEPENDS.gcc49+=	gcc49>=4.9.1
 BUILDLINK_PKGSRCDIR.gcc49=	../../lang/gcc49
 BUILDLINK_DEPMETHOD.gcc49?=	build
@@ -19,7 +19,7 @@ BUILDLINK_AUTO_VARS.gcc49=	no
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(_USE_GCC_SHLIB)
-DEPENDS+=	{gcc49,gcc49-libs}>=${_GCC_REQD}:../../lang/gcc49-libs
+DEPENDS+=	{gcc49,gcc49-libs}>=4.9:../../lang/gcc49-libs
 .endif
 
 pkgbase := gcc49