Sat Sep 6 08:20:29 2014 UTC ()
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.


(jperkin)
diff -r1.15 -r1.16 pkgsrc/lang/gcc/buildlink3.mk
diff -r1.18 -r1.19 pkgsrc/lang/gcc3-c/buildlink3.mk
diff -r1.19 -r1.20 pkgsrc/lang/gcc3-c++/buildlink3.mk
diff -r1.19 -r1.20 pkgsrc/lang/gcc3-f77/buildlink3.mk
diff -r1.19 -r1.20 pkgsrc/lang/gcc3-objc/buildlink3.mk
diff -r1.21 -r1.22 pkgsrc/lang/gcc34/buildlink3.mk
diff -r1.9 -r1.10 pkgsrc/lang/gcc44/buildlink3.mk
diff -r1.6 -r1.7 pkgsrc/lang/gcc45/buildlink3.mk
diff -r1.6 -r1.7 pkgsrc/lang/gcc46/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/lang/gcc47/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/lang/gcc48-cc++/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/lang/gcc48-fortran/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/lang/gcc48-objc/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/lang/gcc49/buildlink3.mk
cvs diff -r1.15 -r1.16 pkgsrc/lang/gcc/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc/Attic/buildlink3.mk 2012/05/07 01:53:39 1.15
+++ pkgsrc/lang/gcc/Attic/buildlink3.mk 2014/09/06 08:20:28 1.16
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: buildlink3.mk,v 1.15 2012/05/07 01:53:39 dholland Exp $ 1# $NetBSD: buildlink3.mk,v 1.16 2014/09/06 08:20:28 jperkin Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5BUILDLINK_TREE+= gcc 5BUILDLINK_TREE+= gcc
6 6
7.if !defined(GCC_BUILDLINK3_MK) 7.if !defined(GCC_BUILDLINK3_MK)
8GCC_BUILDLINK3_MK:= 8GCC_BUILDLINK3_MK:=
9 9
10BUILDLINK_API_DEPENDS.gcc+= gcc>=${_GCC_REQD} 10BUILDLINK_API_DEPENDS.gcc+= gcc>=2.95
11BUILDLINK_ABI_DEPENDS.gcc+= gcc>=2.95.3nb7 11BUILDLINK_ABI_DEPENDS.gcc+= gcc>=2.95.3nb7
12BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc 12BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc
13BUILDLINK_LIBDIRS.gcc?= \ 13BUILDLINK_LIBDIRS.gcc?= \
14 ${_GCC_PREFIX:S/^${BUILDLINK_PREFIX.gcc}\///}lib \ 14 ${_GCC_PREFIX:S/^${BUILDLINK_PREFIX.gcc}\///}lib \
15 ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc}\///} 15 ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc}\///}
16 16
17# Packages that link against shared libraries need a full dependency. 17# Packages that link against shared libraries need a full dependency.
18. if defined(_USE_GCC_SHLIB) 18. if defined(_USE_GCC_SHLIB)
19BUILDLINK_DEPMETHOD.gcc+= full 19BUILDLINK_DEPMETHOD.gcc+= full
20. else 20. else
21BUILDLINK_DEPMETHOD.gcc?= build 21BUILDLINK_DEPMETHOD.gcc?= build
22. endif 22. endif
23.endif # GCC_BUILDLINK3_MK 23.endif # GCC_BUILDLINK3_MK
cvs diff -r1.18 -r1.19 pkgsrc/lang/gcc3-c/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc3-c/Attic/buildlink3.mk 2009/03/20 19:24:49 1.18
+++ pkgsrc/lang/gcc3-c/Attic/buildlink3.mk 2014/09/06 08:20:29 1.19
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.19 2014/09/06 08:20:29 jperkin Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5BUILDLINK_TREE+= gcc3-c 5BUILDLINK_TREE+= gcc3-c
6 6
7.if !defined(GCC3_C_BUILDLINK3_MK) 7.if !defined(GCC3_C_BUILDLINK3_MK)
8GCC3_C_BUILDLINK3_MK:= 8GCC3_C_BUILDLINK3_MK:=
9 9
10. include "../../mk/bsd.prefs.mk" 10. include "../../mk/bsd.prefs.mk"
11. if defined(GCC3_INSTALLTO_SUBPREFIX) 11. if defined(GCC3_INSTALLTO_SUBPREFIX)
12# 12#
13# "gcc3" is the directory named in pkgsrc/lang/gcc3-c/Makefile.common" 13# "gcc3" is the directory named in pkgsrc/lang/gcc3-c/Makefile.common"
14# as GCC3_DEFAULT_SUBPREFIX. 14# as GCC3_DEFAULT_SUBPREFIX.
15# 15#
16. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" 16. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
17GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} 17GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
18. endif 18. endif
19. endif 19. endif
20BUILDLINK_API_DEPENDS.gcc3-c+= gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD} 20BUILDLINK_API_DEPENDS.gcc3-c+= gcc3${GCC3_PKGMODIF}-c>=3.0
21BUILDLINK_ABI_DEPENDS.gcc3-c+= gcc3-c>=3.3.5nb1 21BUILDLINK_ABI_DEPENDS.gcc3-c+= gcc3-c>=3.3.5nb1
22BUILDLINK_PKGSRCDIR.gcc3-c?= ../../lang/gcc3-c 22BUILDLINK_PKGSRCDIR.gcc3-c?= ../../lang/gcc3-c
23BUILDLINK_GCC3_LIBDIRS= lib 23BUILDLINK_GCC3_LIBDIRS= lib
24. if defined(GCC3_INSTALLTO_SUBPREFIX) 24. if defined(GCC3_INSTALLTO_SUBPREFIX)
25BUILDLINK_GCC3_LIBDIRS+= ${GCC3_INSTALLTO_SUBPREFIX}/lib 25BUILDLINK_GCC3_LIBDIRS+= ${GCC3_INSTALLTO_SUBPREFIX}/lib
26. else 26. else
27BUILDLINK_GCC3_LIBDIRS+= gcc3/lib 27BUILDLINK_GCC3_LIBDIRS+= gcc3/lib
28. endif 28. endif
29BUILDLINK_GCC3_LIBDIRS+= ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-c}\///} 29BUILDLINK_GCC3_LIBDIRS+= ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-c}\///}
30BUILDLINK_LIBDIRS.gcc3-c+= ${BUILDLINK_GCC3_LIBDIRS} 30BUILDLINK_LIBDIRS.gcc3-c+= ${BUILDLINK_GCC3_LIBDIRS}
31 31
32# Packages that link against shared libraries need a full dependency. 32# Packages that link against shared libraries need a full dependency.
33. if defined(_USE_GCC_SHLIB) 33. if defined(_USE_GCC_SHLIB)
cvs diff -r1.19 -r1.20 pkgsrc/lang/gcc3-c++/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc3-c++/Attic/buildlink3.mk 2012/05/07 01:53:40 1.19
+++ pkgsrc/lang/gcc3-c++/Attic/buildlink3.mk 2014/09/06 08:20:28 1.20
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.19 2012/05/07 01:53:40 dholland Exp $ 1# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:28 jperkin Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5BUILDLINK_TREE+= gcc3-cxx 5BUILDLINK_TREE+= gcc3-cxx
6 6
7.if !defined(GCC3_CXX_BUILDLINK3_MK) 7.if !defined(GCC3_CXX_BUILDLINK3_MK)
8GCC3_CXX_BUILDLINK3_MK:= 8GCC3_CXX_BUILDLINK3_MK:=
9 9
10. if defined(GCC3_INSTALLTO_SUBPREFIX) 10. if defined(GCC3_INSTALLTO_SUBPREFIX)
11. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" 11. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
12GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} 12GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
13. endif 13. endif
14. endif 14. endif
15BUILDLINK_API_DEPENDS.gcc3-cxx+= gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD} 15BUILDLINK_API_DEPENDS.gcc3-cxx+= gcc3${GCC3_PKGMODIF}-c++>=3.0
16BUILDLINK_ABI_DEPENDS.gcc3-cxx+= gcc3-c++>=3.3.5nb1 16BUILDLINK_ABI_DEPENDS.gcc3-cxx+= gcc3-c++>=3.3.5nb1
17BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++ 17BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++
18BUILDLINK_LIBDIRS.gcc3-cxx?= \ 18BUILDLINK_LIBDIRS.gcc3-cxx?= \
19 lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///} 19 lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///}
20 20
21# Packages that link against shared libraries need a full dependency. 21# Packages that link against shared libraries need a full dependency.
22. if defined(_USE_GCC_SHLIB) 22. if defined(_USE_GCC_SHLIB)
23BUILDLINK_DEPMETHOD.gcc3-cxx+= full 23BUILDLINK_DEPMETHOD.gcc3-cxx+= full
24. else 24. else
25BUILDLINK_DEPMETHOD.gcc3-cxx?= build 25BUILDLINK_DEPMETHOD.gcc3-cxx?= build
26. endif 26. endif
27.endif # GCC3_CXX_BUILDLINK3_MK 27.endif # GCC3_CXX_BUILDLINK3_MK
28 28
cvs diff -r1.19 -r1.20 pkgsrc/lang/gcc3-f77/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc3-f77/Attic/buildlink3.mk 2012/05/07 01:53:40 1.19
+++ pkgsrc/lang/gcc3-f77/Attic/buildlink3.mk 2014/09/06 08:20:29 1.20
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.19 2012/05/07 01:53:40 dholland Exp $ 1# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:29 jperkin Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5BUILDLINK_TREE+= gcc3-f77 5BUILDLINK_TREE+= gcc3-f77
6 6
7.if !defined(GCC3_F77_BUILDLINK3_MK) 7.if !defined(GCC3_F77_BUILDLINK3_MK)
8GCC3_F77_BUILDLINK3_MK:= 8GCC3_F77_BUILDLINK3_MK:=
9 9
10. if defined(GCC3_INSTALLTO_SUBPREFIX) 10. if defined(GCC3_INSTALLTO_SUBPREFIX)
11. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" 11. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
12GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} 12GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
13. endif 13. endif
14. endif 14. endif
15BUILDLINK_API_DEPENDS.gcc3-f77+= gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD} 15BUILDLINK_API_DEPENDS.gcc3-f77+= gcc3${GCC3_PKGMODIF}-f77>=3.0
16BUILDLINK_ABI_DEPENDS.gcc3-f77+= gcc3-f77>=3.3.5nb2 16BUILDLINK_ABI_DEPENDS.gcc3-f77+= gcc3-f77>=3.3.5nb2
17BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77 17BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77
18BUILDLINK_LIBDIRS.gcc3-f77?= \ 18BUILDLINK_LIBDIRS.gcc3-f77?= \
19 lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///} 19 lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///}
20 20
21# Packages that link against shared libraries need a full dependency. 21# Packages that link against shared libraries need a full dependency.
22. if defined(_USE_GCC_SHLIB) 22. if defined(_USE_GCC_SHLIB)
23BUILDLINK_DEPMETHOD.gcc3-f77+= full 23BUILDLINK_DEPMETHOD.gcc3-f77+= full
24. else 24. else
25BUILDLINK_DEPMETHOD.gcc3-f77?= build 25BUILDLINK_DEPMETHOD.gcc3-f77?= build
26. endif 26. endif
27.endif # GCC3_F77_BUILDLINK3_MK 27.endif # GCC3_F77_BUILDLINK3_MK
28 28
cvs diff -r1.19 -r1.20 pkgsrc/lang/gcc3-objc/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc3-objc/Attic/buildlink3.mk 2012/05/07 01:53:40 1.19
+++ pkgsrc/lang/gcc3-objc/Attic/buildlink3.mk 2014/09/06 08:20:29 1.20
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.19 2012/05/07 01:53:40 dholland Exp $ 1# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:29 jperkin Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5BUILDLINK_TREE+= gcc3-objc 5BUILDLINK_TREE+= gcc3-objc
6 6
7.if !defined(GCC3_OBJC_BUILDLINK3_MK) 7.if !defined(GCC3_OBJC_BUILDLINK3_MK)
8GCC3_OBJC_BUILDLINK3_MK:= 8GCC3_OBJC_BUILDLINK3_MK:=
9 9
10. if defined(GCC3_INSTALLTO_SUBPREFIX) 10. if defined(GCC3_INSTALLTO_SUBPREFIX)
11. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" 11. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
12GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} 12GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
13. endif 13. endif
14. endif 14. endif
15BUILDLINK_API_DEPENDS.gcc3-objc+= gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD} 15BUILDLINK_API_DEPENDS.gcc3-objc+= gcc3${GCC3_PKGMODIF}-objc>=3.0
16BUILDLINK_ABI_DEPENDS.gcc3-objc+= gcc3-objc>=3.3.5nb1 16BUILDLINK_ABI_DEPENDS.gcc3-objc+= gcc3-objc>=3.3.5nb1
17BUILDLINK_PKGSRCDIR.gcc3-objc?= ../../lang/gcc3-objc 17BUILDLINK_PKGSRCDIR.gcc3-objc?= ../../lang/gcc3-objc
18BUILDLINK_LIBDIRS.gcc3-objc?= \ 18BUILDLINK_LIBDIRS.gcc3-objc?= \
19 lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///} 19 lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///}
20 20
21# Packages that link against shared libraries need a full dependency. 21# Packages that link against shared libraries need a full dependency.
22. if defined(_USE_GCC_SHLIB) 22. if defined(_USE_GCC_SHLIB)
23BUILDLINK_DEPMETHOD.gcc3-objc+= full 23BUILDLINK_DEPMETHOD.gcc3-objc+= full
24. else 24. else
25BUILDLINK_DEPMETHOD.gcc3-objc?= build 25BUILDLINK_DEPMETHOD.gcc3-objc?= build
26. endif 26. endif
27.endif # GCC3_OBJC_BUILDLINK3_MK 27.endif # GCC3_OBJC_BUILDLINK3_MK
28 28
cvs diff -r1.21 -r1.22 pkgsrc/lang/gcc34/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc34/Attic/buildlink3.mk 2013/04/06 11:06:52 1.21
+++ pkgsrc/lang/gcc34/Attic/buildlink3.mk 2014/09/06 08:20:29 1.22
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: buildlink3.mk,v 1.21 2013/04/06 11:06:52 rodent Exp $ 1# $NetBSD: buildlink3.mk,v 1.22 2014/09/06 08:20:29 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc34 3BUILDLINK_TREE+= gcc34
4 4
5.if !defined(GCC34_BUILDLINK3_MK) 5.if !defined(GCC34_BUILDLINK3_MK)
6GCC34_BUILDLINK3_MK:= 6GCC34_BUILDLINK3_MK:=
7 7
8FIND_PREFIX:= BUILDLINK_PREFIX.gcc34=gcc34 8FIND_PREFIX:= BUILDLINK_PREFIX.gcc34=gcc34
9.include "../../mk/find-prefix.mk" 9.include "../../mk/find-prefix.mk"
10 10
11_GCC34_SUBDIR= gcc34 11_GCC34_SUBDIR= gcc34
12_GCC34_PREFIX= ${BUILDLINK_PREFIX.gcc34}/${_GCC34_SUBDIR} 12_GCC34_PREFIX= ${BUILDLINK_PREFIX.gcc34}/${_GCC34_SUBDIR}
13 13
14BUILDLINK_API_DEPENDS.gcc34+= gcc34>=${_GCC_REQD} 14BUILDLINK_API_DEPENDS.gcc34+= gcc34>=3.4
15BUILDLINK_ABI_DEPENDS.gcc34+= gcc34>=3.4.6nb4 15BUILDLINK_ABI_DEPENDS.gcc34+= gcc34>=3.4.6nb4
16BUILDLINK_PKGSRCDIR.gcc34?= ../../lang/gcc34 16BUILDLINK_PKGSRCDIR.gcc34?= ../../lang/gcc34
17 17
18. if exists(${_GCC34_PREFIX}/bin/gcc) 18. if exists(${_GCC34_PREFIX}/bin/gcc)
19# logic for detecting the ADA compiler 19# logic for detecting the ADA compiler
20gcc34_GNAT1!=${_GCC34_PREFIX}/bin/gcc -print-prog-name=gnat1 20gcc34_GNAT1!=${_GCC34_PREFIX}/bin/gcc -print-prog-name=gnat1
21. if exists(${gcc34_GNAT1}) 21. if exists(${gcc34_GNAT1})
22BUILDLINK_ENV+= ADAC=${_GCC34_PREFIX}/bin/gcc 22BUILDLINK_ENV+= ADAC=${_GCC34_PREFIX}/bin/gcc
23. endif 23. endif
24 24
25# add libraries 25# add libraries
26BUILDLINK_LIBDIRS.gcc34+= ${_GCC34_SUBDIR}/lib 26BUILDLINK_LIBDIRS.gcc34+= ${_GCC34_SUBDIR}/lib
27 27
cvs diff -r1.9 -r1.10 pkgsrc/lang/gcc44/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc44/Attic/buildlink3.mk 2013/04/06 11:06:52 1.9
+++ pkgsrc/lang/gcc44/Attic/buildlink3.mk 2014/09/06 08:20:29 1.10
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: buildlink3.mk,v 1.9 2013/04/06 11:06:52 rodent Exp $ 1# $NetBSD: buildlink3.mk,v 1.10 2014/09/06 08:20:29 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc44 3BUILDLINK_TREE+= gcc44
4 4
5.if !defined(GCC44_BUILDLINK3_MK) 5.if !defined(GCC44_BUILDLINK3_MK)
6GCC44_BUILDLINK3_MK:= 6GCC44_BUILDLINK3_MK:=
7 7
8FIND_PREFIX:= BUILDLINK_PREFIX.gcc44=gcc44 8FIND_PREFIX:= BUILDLINK_PREFIX.gcc44=gcc44
9.include "../../mk/find-prefix.mk" 9.include "../../mk/find-prefix.mk"
10 10
11_GCC44_SUBDIR= gcc44 11_GCC44_SUBDIR= gcc44
12_GCC44_PREFIX= ${BUILDLINK_PREFIX.gcc44}/${_GCC44_SUBDIR} 12_GCC44_PREFIX= ${BUILDLINK_PREFIX.gcc44}/${_GCC44_SUBDIR}
13 13
14BUILDLINK_API_DEPENDS.gcc44+= gcc44>=${_GCC_REQD} 14BUILDLINK_API_DEPENDS.gcc44+= gcc44>=4.4
15BUILDLINK_ABI_DEPENDS.gcc44+= gcc44>=4.4.5nb2 15BUILDLINK_ABI_DEPENDS.gcc44+= gcc44>=4.4.5nb2
16BUILDLINK_PKGSRCDIR.gcc44?= ../../lang/gcc44 16BUILDLINK_PKGSRCDIR.gcc44?= ../../lang/gcc44
17 17
18.if exists(${_GCC44_PREFIX}/bin/gcc) 18.if exists(${_GCC44_PREFIX}/bin/gcc)
19 19
20# logic for detecting the ADA compiler (not yet supported) 20# logic for detecting the ADA compiler (not yet supported)
21#gcc44_GNAT1!=${_GCC44_PREFIX}/bin/gcc -print-prog-name=gnat1 21#gcc44_GNAT1!=${_GCC44_PREFIX}/bin/gcc -print-prog-name=gnat1
22#. if exists(${gcc44_GNAT1}) 22#. if exists(${gcc44_GNAT1})
23#CONFIGURE_ENV+= ADAC=${_GCC44_PREFIX}/bin/gcc 23#CONFIGURE_ENV+= ADAC=${_GCC44_PREFIX}/bin/gcc
24#MAKE_ENV+= ADAC=${_GCC44_PREFIX}/bin/gcc 24#MAKE_ENV+= ADAC=${_GCC44_PREFIX}/bin/gcc
25#. endif 25#. endif
26 26
27# add libraries 27# add libraries
cvs diff -r1.6 -r1.7 pkgsrc/lang/gcc45/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc45/Attic/buildlink3.mk 2013/04/06 11:06:52 1.6
+++ pkgsrc/lang/gcc45/Attic/buildlink3.mk 2014/09/06 08:20:29 1.7
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: buildlink3.mk,v 1.6 2013/04/06 11:06:52 rodent Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2014/09/06 08:20:29 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc45 3BUILDLINK_TREE+= gcc45
4 4
5.if !defined(GCC45_BUILDLINK3_MK) 5.if !defined(GCC45_BUILDLINK3_MK)
6GCC45_BUILDLINK3_MK:= 6GCC45_BUILDLINK3_MK:=
7 7
8FIND_PREFIX:= BUILDLINK_PREFIX.gcc45=gcc45 8FIND_PREFIX:= BUILDLINK_PREFIX.gcc45=gcc45
9.include "../../mk/find-prefix.mk" 9.include "../../mk/find-prefix.mk"
10 10
11_GCC45_SUBDIR= gcc45 11_GCC45_SUBDIR= gcc45
12_GCC45_PREFIX= ${BUILDLINK_PREFIX.gcc45}/${_GCC45_SUBDIR} 12_GCC45_PREFIX= ${BUILDLINK_PREFIX.gcc45}/${_GCC45_SUBDIR}
13 13
14BUILDLINK_API_DEPENDS.gcc45+= gcc45>=${_GCC_REQD} 14BUILDLINK_API_DEPENDS.gcc45+= gcc45>=4.5
15BUILDLINK_ABI_DEPENDS.gcc45+= gcc45>=4.5.0 15BUILDLINK_ABI_DEPENDS.gcc45+= gcc45>=4.5.0
16BUILDLINK_PKGSRCDIR.gcc45?= ../../lang/gcc45 16BUILDLINK_PKGSRCDIR.gcc45?= ../../lang/gcc45
17 17
18.if exists(${_GCC45_PREFIX}/bin/gcc) 18.if exists(${_GCC45_PREFIX}/bin/gcc)
19 19
20# logic for detecting the ADA compiler (not yet supported) 20# logic for detecting the ADA compiler (not yet supported)
21#gcc45_GNAT1!=${_GCC45_PREFIX}/bin/gcc -print-prog-name=gnat1 21#gcc45_GNAT1!=${_GCC45_PREFIX}/bin/gcc -print-prog-name=gnat1
22#. if exists(${gcc45_GNAT1}) 22#. if exists(${gcc45_GNAT1})
23#CONFIGURE_ENV+= ADAC=${_GCC45_PREFIX}/bin/gcc 23#CONFIGURE_ENV+= ADAC=${_GCC45_PREFIX}/bin/gcc
24#MAKE_ENV+= ADAC=${_GCC45_PREFIX}/bin/gcc 24#MAKE_ENV+= ADAC=${_GCC45_PREFIX}/bin/gcc
25#. endif 25#. endif
26 26
27# add libraries 27# add libraries
cvs diff -r1.6 -r1.7 pkgsrc/lang/gcc46/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc46/Attic/buildlink3.mk 2013/04/06 11:06:52 1.6
+++ pkgsrc/lang/gcc46/Attic/buildlink3.mk 2014/09/06 08:20:29 1.7
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: buildlink3.mk,v 1.6 2013/04/06 11:06:52 rodent Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2014/09/06 08:20:29 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc46 3BUILDLINK_TREE+= gcc46
4 4
5.if !defined(GCC46_BUILDLINK3_MK) 5.if !defined(GCC46_BUILDLINK3_MK)
6GCC46_BUILDLINK3_MK:= 6GCC46_BUILDLINK3_MK:=
7 7
8FIND_PREFIX:= BUILDLINK_PREFIX.gcc46=gcc46 8FIND_PREFIX:= BUILDLINK_PREFIX.gcc46=gcc46
9.include "../../mk/find-prefix.mk" 9.include "../../mk/find-prefix.mk"
10 10
11_GCC46_SUBDIR= gcc46 11_GCC46_SUBDIR= gcc46
12_GCC46_PREFIX= ${BUILDLINK_PREFIX.gcc46}/${_GCC46_SUBDIR} 12_GCC46_PREFIX= ${BUILDLINK_PREFIX.gcc46}/${_GCC46_SUBDIR}
13 13
14BUILDLINK_API_DEPENDS.gcc46+= gcc46>=${_GCC_REQD} 14BUILDLINK_API_DEPENDS.gcc46+= gcc46>=4.6
15BUILDLINK_ABI_DEPENDS.gcc46+= gcc46>=4.6.0 15BUILDLINK_ABI_DEPENDS.gcc46+= gcc46>=4.6.0
16BUILDLINK_PKGSRCDIR.gcc46?= ../../lang/gcc46 16BUILDLINK_PKGSRCDIR.gcc46?= ../../lang/gcc46
17 17
18.if exists(${_GCC46_PREFIX}/bin/gcc) 18.if exists(${_GCC46_PREFIX}/bin/gcc)
19 19
20# logic for detecting the ADA compiler (not yet supported) 20# logic for detecting the ADA compiler (not yet supported)
21#gcc46_GNAT1!=${_GCC46_PREFIX}/bin/gcc -print-prog-name=gnat1 21#gcc46_GNAT1!=${_GCC46_PREFIX}/bin/gcc -print-prog-name=gnat1
22#. if exists(${gcc46_GNAT1}) 22#. if exists(${gcc46_GNAT1})
23#CONFIGURE_ENV+= ADAC=${_GCC46_PREFIX}/bin/gcc 23#CONFIGURE_ENV+= ADAC=${_GCC46_PREFIX}/bin/gcc
24#MAKE_ENV+= ADAC=${_GCC46_PREFIX}/bin/gcc 24#MAKE_ENV+= ADAC=${_GCC46_PREFIX}/bin/gcc
25#. endif 25#. endif
26 26
27# add libraries 27# add libraries
cvs diff -r1.8 -r1.9 pkgsrc/lang/gcc47/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc47/Attic/buildlink3.mk 2013/01/31 23:34:21 1.8
+++ pkgsrc/lang/gcc47/Attic/buildlink3.mk 2014/09/06 08:20:29 1.9
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: buildlink3.mk,v 1.8 2013/01/31 23:34:21 hans Exp $ 1# $NetBSD: buildlink3.mk,v 1.9 2014/09/06 08:20:29 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc47 3BUILDLINK_TREE+= gcc47
4 4
5.if !defined(GCC47_BUILDLINK3_MK) 5.if !defined(GCC47_BUILDLINK3_MK)
6GCC47_BUILDLINK3_MK:= 6GCC47_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gcc47+= gcc47>=${_GCC_REQD} 8BUILDLINK_API_DEPENDS.gcc47+= gcc47>=4.7
9BUILDLINK_ABI_DEPENDS.gcc47+= gcc47>=4.7.0 9BUILDLINK_ABI_DEPENDS.gcc47+= gcc47>=4.7.0
10BUILDLINK_PKGSRCDIR.gcc47= ../../lang/gcc47 10BUILDLINK_PKGSRCDIR.gcc47= ../../lang/gcc47
11BUILDLINK_DEPMETHOD.gcc47?= build 11BUILDLINK_DEPMETHOD.gcc47?= build
12 12
13FIND_PREFIX:= BUILDLINK_PREFIX.gcc47=gcc47 13FIND_PREFIX:= BUILDLINK_PREFIX.gcc47=gcc47
14.include "../../mk/find-prefix.mk" 14.include "../../mk/find-prefix.mk"
15BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc47}/gcc47 15BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc47}/gcc47
16 16
17BUILDLINK_FILES.gcc47= #empty 17BUILDLINK_FILES.gcc47= #empty
18BUILDLINK_AUTO_VARS.gcc47= no 18BUILDLINK_AUTO_VARS.gcc47= no
19 19
20# Packages that link against shared libraries need a full dependency. 20# Packages that link against shared libraries need a full dependency.
21.if defined(_USE_GCC_SHLIB) 21.if defined(_USE_GCC_SHLIB)
22DEPENDS+= {gcc47,gcc47-libs}>=${_GCC_REQD}:../../lang/gcc47-libs 22DEPENDS+= {gcc47,gcc47-libs}>=4.7:../../lang/gcc47-libs
23ABI_DEPENDS+= {gcc47,gcc47-libs}>=4.7.0:../../lang/gcc47-libs 23ABI_DEPENDS+= {gcc47,gcc47-libs}>=4.7.0:../../lang/gcc47-libs
24.endif 24.endif
25 25
26pkgbase := gcc47 26pkgbase := gcc47
27.include "../../mk/pkg-build-options.mk" 27.include "../../mk/pkg-build-options.mk"
28.if !empty(PKG_BUILD_OPTIONS.gcc47:Mgcc-java) 28.if !empty(PKG_BUILD_OPTIONS.gcc47:Mgcc-java)
29.include "../../devel/zlib/buildlink3.mk" 29.include "../../devel/zlib/buildlink3.mk"
30.endif 30.endif
31 31
32.include "../../mk/dlopen.buildlink3.mk" 32.include "../../mk/dlopen.buildlink3.mk"
33.include "../../mk/pthread.buildlink3.mk" 33.include "../../mk/pthread.buildlink3.mk"
34.endif # GCC47_BUILDLINK3_MK 34.endif # GCC47_BUILDLINK3_MK
35BUILDLINK_TREE+= -gcc47 35BUILDLINK_TREE+= -gcc47
cvs diff -r1.3 -r1.4 pkgsrc/lang/gcc48-cc++/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc48-cc++/Attic/buildlink3.mk 2014/09/05 21:41:45 1.3
+++ pkgsrc/lang/gcc48-cc++/Attic/buildlink3.mk 2014/09/06 08:20:29 1.4
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.3 2014/09/05 21:41:45 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.4 2014/09/06 08:20:29 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc48-cc++ 3BUILDLINK_TREE+= gcc48-cc++
4 4
5.if !defined(GCC48_CC++_BUILDLINK3_MK) 5.if !defined(GCC48_CC++_BUILDLINK3_MK)
6GCC48_CC++_BUILDLINK3_MK:= 6GCC48_CC++_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gcc48-cc+++= gcc48-cc++>=${_GCC_REQD} 8BUILDLINK_API_DEPENDS.gcc48-cc+++= gcc48-cc++>=4.8
9BUILDLINK_PKGSRCDIR.gcc48-cc++?= ../../lang/gcc48-cc++ 9BUILDLINK_PKGSRCDIR.gcc48-cc++?= ../../lang/gcc48-cc++
10 10
11BUILDLINK_GCC48_LIBDIRS= gcc48/lib 11BUILDLINK_GCC48_LIBDIRS= gcc48/lib
12BUILDLINK_LIBDIRS.gcc48-cc+++= ${BUILDLINK_GCC48_LIBDIRS} 12BUILDLINK_LIBDIRS.gcc48-cc+++= ${BUILDLINK_GCC48_LIBDIRS}
13BUILDLINK_DEPMETHOD.gcc48-cc++?= build 13BUILDLINK_DEPMETHOD.gcc48-cc++?= build
14.endif # GCC48_CC++_BUILDLINK3_MK 14.endif # GCC48_CC++_BUILDLINK3_MK
15 15
16# Packages that link against shared libraries need a full dependency. 16# Packages that link against shared libraries need a full dependency.
17.if defined(_USE_GCC_SHLIB) 17.if defined(_USE_GCC_SHLIB)
18DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs 18DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs
19ABI_DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs 19ABI_DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs
20.endif 20.endif
21 21
cvs diff -r1.2 -r1.3 pkgsrc/lang/gcc48-fortran/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc48-fortran/Attic/buildlink3.mk 2014/06/01 08:11:13 1.2
+++ pkgsrc/lang/gcc48-fortran/Attic/buildlink3.mk 2014/09/06 08:20:29 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.2 2014/06/01 08:11:13 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2014/09/06 08:20:29 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc48-fortran 3BUILDLINK_TREE+= gcc48-fortran
4 4
5.if !defined(GCC48_FORTRAN_BUILDLINK3_MK) 5.if !defined(GCC48_FORTRAN_BUILDLINK3_MK)
6GCC48_FORTRAN_BUILDLINK3_MK:= 6GCC48_FORTRAN_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gcc48-fortran+= gcc48-fortran>=${_GCC_REQD} 8BUILDLINK_API_DEPENDS.gcc48-fortran+= gcc48-fortran>=4.8
9BUILDLINK_PKGSRCDIR.gcc48-fortran?= ../../lang/gcc48-fortran 9BUILDLINK_PKGSRCDIR.gcc48-fortran?= ../../lang/gcc48-fortran
10 10
11BUILDLINK_GCC48_LIBDIRS= gcc48/lib 11BUILDLINK_GCC48_LIBDIRS= gcc48/lib
12BUILDLINK_LIBDIRS.gcc48-fortran+= ${BUILDLINK_GCC48_LIBDIRS} 12BUILDLINK_LIBDIRS.gcc48-fortran+= ${BUILDLINK_GCC48_LIBDIRS}
13BUILDLINK_DEPMETHOD.gcc48-fortran?= build 13BUILDLINK_DEPMETHOD.gcc48-fortran?= build
14.endif # GCC48_FORTRAN_BUILDLINK3_MK 14.endif # GCC48_FORTRAN_BUILDLINK3_MK
15 15
16# Packages that link against shared libraries need a full dependency. 16# Packages that link against shared libraries need a full dependency.
17.if defined(_USE_GCC_SHLIB) 17.if defined(_USE_GCC_SHLIB)
18DEPENDS+= gcc48-libs>=${_GCC_REQD}:../../lang/gcc48-libs 18DEPENDS+= gcc48-libs>=4.8:../../lang/gcc48-libs
19ABI_DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs 19ABI_DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs
20.endif 20.endif
21 21
22BUILDLINK_TREE+= -gcc48-fortran 22BUILDLINK_TREE+= -gcc48-fortran
cvs diff -r1.2 -r1.3 pkgsrc/lang/gcc48-objc/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc48-objc/Attic/buildlink3.mk 2014/06/01 08:11:13 1.2
+++ pkgsrc/lang/gcc48-objc/Attic/buildlink3.mk 2014/09/06 08:20:29 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.2 2014/06/01 08:11:13 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2014/09/06 08:20:29 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc48-objc 3BUILDLINK_TREE+= gcc48-objc
4 4
5.if !defined(GCC48_OBJC_BUILDLINK3_MK) 5.if !defined(GCC48_OBJC_BUILDLINK3_MK)
6GCC48_OBJC_BUILDLINK3_MK:= 6GCC48_OBJC_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gcc48-objc+= gcc48-objc>=${_GCC_REQD} 8BUILDLINK_API_DEPENDS.gcc48-objc+= gcc48-objc>=4.8
9BUILDLINK_PKGSRCDIR.gcc48-objc?= ../../lang/gcc48-objc 9BUILDLINK_PKGSRCDIR.gcc48-objc?= ../../lang/gcc48-objc
10 10
11BUILDLINK_GCC48_LIBDIRS= gcc48/lib 11BUILDLINK_GCC48_LIBDIRS= gcc48/lib
12BUILDLINK_LIBDIRS.gcc48-objc+= ${BUILDLINK_GCC48_LIBDIRS} 12BUILDLINK_LIBDIRS.gcc48-objc+= ${BUILDLINK_GCC48_LIBDIRS}
13BUILDLINK_DEPMETHOD.gcc48-objc?= build 13BUILDLINK_DEPMETHOD.gcc48-objc?= build
14.endif # GCC48_OBJC_BUILDLINK3_MK 14.endif # GCC48_OBJC_BUILDLINK3_MK
15 15
16# Packages that link against shared libraries need a full dependency. 16# Packages that link against shared libraries need a full dependency.
17.if defined(_USE_GCC_SHLIB) 17.if defined(_USE_GCC_SHLIB)
18DEPENDS+= gcc48-libs>=${_GCC_REQD}:../../lang/gcc48-libs 18DEPENDS+= gcc48-libs>=4.8:../../lang/gcc48-libs
19ABI_DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs 19ABI_DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs
20.endif 20.endif
21 21
22BUILDLINK_TREE+= -gcc48-objc 22BUILDLINK_TREE+= -gcc48-objc
cvs diff -r1.1 -r1.2 pkgsrc/lang/gcc49/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc49/Attic/buildlink3.mk 2014/09/04 18:43:11 1.1
+++ pkgsrc/lang/gcc49/Attic/buildlink3.mk 2014/09/06 08:20:29 1.2
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.1 2014/09/04 18:43:11 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2014/09/06 08:20:29 jperkin Exp $
2 2
3BUILDLINK_TREE+= gcc49 3BUILDLINK_TREE+= gcc49
4 4
5.if !defined(GCC49_BUILDLINK3_MK) 5.if !defined(GCC49_BUILDLINK3_MK)
6GCC49_BUILDLINK3_MK:= 6GCC49_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gcc49+= gcc49>=${_GCC_REQD} 8BUILDLINK_API_DEPENDS.gcc49+= gcc49>=4.9
9BUILDLINK_ABI_DEPENDS.gcc49+= gcc49>=4.9.1 9BUILDLINK_ABI_DEPENDS.gcc49+= gcc49>=4.9.1
10BUILDLINK_PKGSRCDIR.gcc49= ../../lang/gcc49 10BUILDLINK_PKGSRCDIR.gcc49= ../../lang/gcc49
11BUILDLINK_DEPMETHOD.gcc49?= build 11BUILDLINK_DEPMETHOD.gcc49?= build
12 12
13FIND_PREFIX:= BUILDLINK_PREFIX.gcc49=gcc49 13FIND_PREFIX:= BUILDLINK_PREFIX.gcc49=gcc49
14.include "../../mk/find-prefix.mk" 14.include "../../mk/find-prefix.mk"
15BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc49}/gcc49 15BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc49}/gcc49
16 16
17BUILDLINK_FILES.gcc49= #empty 17BUILDLINK_FILES.gcc49= #empty
18BUILDLINK_AUTO_VARS.gcc49= no 18BUILDLINK_AUTO_VARS.gcc49= no
19 19
20# Packages that link against shared libraries need a full dependency. 20# Packages that link against shared libraries need a full dependency.
21.if defined(_USE_GCC_SHLIB) 21.if defined(_USE_GCC_SHLIB)
22DEPENDS+= {gcc49,gcc49-libs}>=${_GCC_REQD}:../../lang/gcc49-libs 22DEPENDS+= {gcc49,gcc49-libs}>=4.9:../../lang/gcc49-libs
23.endif 23.endif
24 24
25pkgbase := gcc49 25pkgbase := gcc49
26.include "../../mk/pkg-build-options.mk" 26.include "../../mk/pkg-build-options.mk"
27.if !empty(PKG_BUILD_OPTIONS.gcc49:Mgcc-java) 27.if !empty(PKG_BUILD_OPTIONS.gcc49:Mgcc-java)
28.include "../../devel/zlib/buildlink3.mk" 28.include "../../devel/zlib/buildlink3.mk"
29.endif 29.endif
30 30
31.include "../../mk/dlopen.buildlink3.mk" 31.include "../../mk/dlopen.buildlink3.mk"
32.include "../../mk/pthread.buildlink3.mk" 32.include "../../mk/pthread.buildlink3.mk"
33.endif # GCC49_BUILDLINK3_MK 33.endif # GCC49_BUILDLINK3_MK
34BUILDLINK_TREE+= -gcc49 34BUILDLINK_TREE+= -gcc49