Sat Jun 15 21:52:11 2013 UTC ()
"fortran88" is unknown, make it "fortran77".


(asau)
diff -r1.139 -r1.140 pkgsrc/mk/compiler/gcc.mk

cvs diff -r1.139 -r1.140 pkgsrc/mk/compiler/gcc.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gcc.mk 2013/06/15 21:50:43 1.139
+++ pkgsrc/mk/compiler/gcc.mk 2013/06/15 21:52:11 1.140
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.139 2013/06/15 21:50:43 asau Exp $ 1# $NetBSD: gcc.mk,v 1.140 2013/06/15 21:52:11 asau 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#
@@ -458,27 +458,27 @@ _USE_GCC_SHLIB?= yes @@ -458,27 +458,27 @@ _USE_GCC_SHLIB?= yes
458# 458#
459# We require gcc-4.8.x in the lang/gcc48 directory. 459# We require gcc-4.8.x in the lang/gcc48 directory.
460# 460#
461_GCC_PKGBASE= gcc48 461_GCC_PKGBASE= gcc48
462. if !empty(PKGPATH:Mlang/gcc48) 462. if !empty(PKGPATH:Mlang/gcc48)
463_IGNORE_GCC= yes 463_IGNORE_GCC= yes
464MAKEFLAGS+= _IGNORE_GCC=yes 464MAKEFLAGS+= _IGNORE_GCC=yes
465. endif 465. endif
466. if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc) 466. if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
467_GCC_PKGSRCDIR= ../../lang/gcc48 467_GCC_PKGSRCDIR= ../../lang/gcc48
468_GCC_DEPENDENCY= gcc48>=${_GCC_REQD}:../../lang/gcc48 468_GCC_DEPENDENCY= gcc48>=${_GCC_REQD}:../../lang/gcc48
469. if !empty(_LANGUAGES.gcc:Mc++) || \ 469. if !empty(_LANGUAGES.gcc:Mc++) || \
470 !empty(_LANGUAGES.gcc:Mfortran) || \ 470 !empty(_LANGUAGES.gcc:Mfortran) || \
471 !empty(_LANGUAGES.gcc:Mfortran88) || \ 471 !empty(_LANGUAGES.gcc:Mfortran77) || \
472 !empty(_LANGUAGES.gcc:Mgo) || \ 472 !empty(_LANGUAGES.gcc:Mgo) || \
473 !empty(_LANGUAGES.gcc:Mobjc) || \ 473 !empty(_LANGUAGES.gcc:Mobjc) || \
474 !empty(_LANGUAGES.gcc:Mobj-c++) 474 !empty(_LANGUAGES.gcc:Mobj-c++)
475_USE_GCC_SHLIB?= yes 475_USE_GCC_SHLIB?= yes
476. endif 476. endif
477. endif 477. endif
478.elif !empty(_NEED_GCC_AUX:M[yY][eE][sS]) 478.elif !empty(_NEED_GCC_AUX:M[yY][eE][sS])
479# 479#
480# We require Ada-capable compiler in the lang/gcc-aux directory. 480# We require Ada-capable compiler in the lang/gcc-aux directory.
481# 481#
482_GCC_PKGBASE= gcc-aux 482_GCC_PKGBASE= gcc-aux
483. if !empty(PKGPATH:Mlang/gcc-aux) 483. if !empty(PKGPATH:Mlang/gcc-aux)
484_IGNORE_GCC= yes 484_IGNORE_GCC= yes