Mon Nov 3 13:06:39 2014 UTC ()
Fix GCC49 pattern.
>From richard@, thank you.


(ryoon)
diff -r1.152 -r1.153 pkgsrc/mk/compiler/gcc.mk
cvs diff -r1.152 -r1.153 pkgsrc/mk/compiler/gcc.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gcc.mk 2014/10/31 14:22:20 1.152
+++ pkgsrc/mk/compiler/gcc.mk 2014/11/03 13:06:39 1.153
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.152 2014/10/31 14:22:20 ryoon Exp $ 1# $NetBSD: gcc.mk,v 1.153 2014/11/03 13:06:39 ryoon Exp $
2# 2#
3# This is the compiler definition for the GNU Compiler Collection. 3# This is the compiler definition for the GNU Compiler Collection.
4# 4#
5# User-settable variables: 5# User-settable variables:
6# 6#
7# GCCBASE 7# GCCBASE
8# If using a native GCC and the compiler is not in $PATH then 8# If using a native GCC and the compiler is not in $PATH then
9# this should be set to the base installation directory. 9# this should be set to the base installation directory.
10# 10#
11# USE_NATIVE_GCC 11# USE_NATIVE_GCC
12# When set to "yes", the native gcc is used, no matter which 12# When set to "yes", the native gcc is used, no matter which
13# compiler version a package requires. 13# compiler version a package requires.
14# 14#
@@ -473,27 +473,27 @@ MAKEFLAGS+= _IGNORE_GCC=yes @@ -473,27 +473,27 @@ MAKEFLAGS+= _IGNORE_GCC=yes
473. endif 473. endif
474. if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc) 474. if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
475_GCC_PKGSRCDIR= ../../lang/gcc48 475_GCC_PKGSRCDIR= ../../lang/gcc48
476_GCC_DEPENDENCY= gcc48>=${_GCC_REQD}:../../lang/gcc48 476_GCC_DEPENDENCY= gcc48>=${_GCC_REQD}:../../lang/gcc48
477. if !empty(_LANGUAGES.gcc:Mc++) || \ 477. if !empty(_LANGUAGES.gcc:Mc++) || \
478 !empty(_LANGUAGES.gcc:Mfortran) || \ 478 !empty(_LANGUAGES.gcc:Mfortran) || \
479 !empty(_LANGUAGES.gcc:Mfortran77) || \ 479 !empty(_LANGUAGES.gcc:Mfortran77) || \
480 !empty(_LANGUAGES.gcc:Mgo) || \ 480 !empty(_LANGUAGES.gcc:Mgo) || \
481 !empty(_LANGUAGES.gcc:Mobjc) || \ 481 !empty(_LANGUAGES.gcc:Mobjc) || \
482 !empty(_LANGUAGES.gcc:Mobj-c++) 482 !empty(_LANGUAGES.gcc:Mobj-c++)
483_USE_GCC_SHLIB?= yes 483_USE_GCC_SHLIB?= yes
484. endif 484. endif
485. endif 485. endif
486.elif !empty(_NEED_GCC48:M[yY][eE][sS]) 486.elif !empty(_NEED_GCC49:M[yY][eE][sS])
487# 487#
488# We require gcc-4.9.x in the lang/gcc49-* directory. 488# We require gcc-4.9.x in the lang/gcc49-* directory.
489# 489#
490_GCC_PKGBASE= gcc49 490_GCC_PKGBASE= gcc49
491. if !empty(PKGPATH:Mlang/gcc49) 491. if !empty(PKGPATH:Mlang/gcc49)
492_IGNORE_GCC= yes 492_IGNORE_GCC= yes
493MAKEFLAGS+= _IGNORE_GCC=yes 493MAKEFLAGS+= _IGNORE_GCC=yes
494. endif 494. endif
495. if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc) 495. if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
496_GCC_PKGSRCDIR= ../../lang/gcc49 496_GCC_PKGSRCDIR= ../../lang/gcc49
497_GCC_DEPENDENCY= gcc49>=${_GCC_REQD}:../../lang/gcc49 497_GCC_DEPENDENCY= gcc49>=${_GCC_REQD}:../../lang/gcc49
498. if !empty(_LANGUAGES.gcc:Mc++) || \ 498. if !empty(_LANGUAGES.gcc:Mc++) || \
499 !empty(_LANGUAGES.gcc:Mfortran) || \ 499 !empty(_LANGUAGES.gcc:Mfortran) || \