[pkgsrc/trunk]: pkgsrc/mk/compiler Fix error under recent NetBSD current (GCC...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/812972c0af93
branches:  trunk
changeset: 635166:812972c0af93
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sun Jun 01 09:58:13 2014 +0000

description:
Fix error under recent NetBSD current (GCC 4.8.3).

diffstat:

 mk/compiler/gcc.mk      |    5 +-
 mk/compiler/gfortran.mk |  117 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+), 2 deletions(-)

diffs (140 lines):

diff -r 06ec61a67ba3 -r 812972c0af93 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Sun Jun 01 08:26:24 2014 +0000
+++ b/mk/compiler/gcc.mk        Sun Jun 01 09:58:13 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.146 2014/06/01 08:14:27 ryoon Exp $
+# $NetBSD: gcc.mk,v 1.147 2014/06/01 09:58:13 ryoon Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -851,7 +851,8 @@
 #
 .if (!empty(MACHINE_PLATFORM:MNetBSD-6.99.[4-9]*) || \
        !empty(MACHINE_PLATFORM:MNetBSD-[7-9]*)) && \
-       !empty(CC_VERSION:Mgcc-4.8*)
+    (!empty(CC_VERSION:Mgcc-4.[8-9]*) || \
+       !empty(CC_VERSION:Mgcc-[5-9].*))
 PKGSRC_FORTRAN?=gfortran
 .else
 PKGSRC_FORTRAN?=g95
diff -r 06ec61a67ba3 -r 812972c0af93 mk/compiler/gfortran.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/compiler/gfortran.mk   Sun Jun 01 09:58:13 2014 +0000
@@ -0,0 +1,117 @@
+# $NetBSD: gfortran.mk,v 1.3 2014/06/01 09:58:13 ryoon Exp $
+#
+# Copyright (c) 2005 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Johnny C. Lam.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+.if !defined(COMPILER_GFORTRAN_MK)
+COMPILER_GFORTRAN_MK=  defined
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(PKGPATH:Mlang/gcc48-fortran) || !empty(PKGPATH:Mdevel/patch) || \
+    !empty(PKGPATH:Mdevel/libtool-base)
+IGNORE_GFORTRAN=       yes
+MAKEFLAGS+=            IGNORE_GFORTRAN=yes
+.endif
+
+.if defined(IGNORE_GFORTRAN)
+_USE_GFORTRAN= NO
+.endif
+
+# LANGUAGES.<compiler> is the list of supported languages by the compiler.
+# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
+# requested by the package in USE_LANGUAGES.
+#
+LANGUAGES.gfortran=    fortran fortran77
+_LANGUAGES.gfortran=   # empty
+.for _lang_ in ${USE_LANGUAGES}
+_LANGUAGES.gfortran+=  ${LANGUAGES.gfortran:M${_lang_}}
+.endfor
+.if empty(_LANGUAGES.gfortran)
+_USE_GFORTRAN= NO
+.endif
+
+.if !defined(_USE_GFORTRAN)
+_USE_GFORTRAN= YES
+.endif
+
+.if !empty(_USE_GFORTRAN:M[yY][eE][sS])
+EVAL_PREFIX+=          _GFORTRANBASE=gfortran
+_GFORTRANBASE_DEFAULT= ${LOCALBASE}
+FC=            gfortran
+
+_GFORTRAN_DIR= ${WRKDIR}/.gfortran
+_GFORTRAN_VARS=        # empty
+.  if !empty(_LANGUAGES.gfortran:Mfortran) || \
+      !empty(_LANGUAGES.gfortran:Mfortran77)
+PKG_FC?=       ${FC}
+_GFORTRAN_VARS+=       FC
+_GFORTRAN_FC:= ${_GFORTRAN_DIR}/bin/${PKG_FC:T}
+_ALIASES.FC+=  f77 g77 g95 gfortran
+FCPATH=                ${_GFORTRANBASE}/bin/gfortran
+PKG_FC:=       ${_GFORTRAN_FC}
+.  endif
+
+# Prepend the path the to the compiler to the PATH
+.  if !empty(_LANGUAGES.gfortran)
+PREPEND_PATH+= ${_GFORTRAN_DIR}/bin
+.  endif
+
+# Add the dependency on gfortran.
+.  include "../../lang/gcc48-fortran/buildlink3.mk"
+
+.  if defined(GFORTRAN_DIR) && !empty(GFORTRAN_DIR)
+PKGSRC_MAKE_ENV+=      GFORTRAN_DIR=${GFORTRAN_DIR:Q}
+.  endif
+
+# Create symlinks for the compiler into ${WRKDIR}.
+.  for _var_ in ${_GFORTRAN_VARS}
+.    if !target(${_GFORTRAN_${_var_}})
+override-tools: ${_GFORTRAN_${_var_}}
+${_GFORTRAN_${_var_}}:
+       ${RUN}${MKDIR} ${.TARGET:H}
+       ${RUN}                                  \
+       ${LN} -fs ${_GFORTRANBASE}/bin/gfortran ${.TARGET}
+.      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
+       ${RUN}                                  \
+       if [ ! -x "${_alias_}" ]; then                                  \
+               ${LN} -fs ${_GFORTRANBASE}/bin/gfortran ${_alias_};             \
+       fi
+.      endfor
+.    endif
+.  endfor
+.endif # _USE_GFORTRAN == "yes"
+
+.endif # COMPILER_GFORTRAN_MK