Restore monolithic gcc48 and gcc48-libs.

* No objection on tech-pkg@ mailing list.

2 files changed, 16 insertions, 148 deletions

diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index fd30c612715..06d507a8fd4 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.151 2014/09/06 08:32:55 jperkin Exp $
+# $NetBSD: gcc.mk,v 1.152 2014/10/31 14:22:20 ryoon Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -464,19 +464,26 @@ _USE_GCC_SHLIB?=	yes
 .  endif
 .elif !empty(_NEED_GCC48:M[yY][eE][sS])
 #
-# We require gcc-4.8.x in the lang/gcc48-* directory.
+# We require gcc-4.8.x in the lang/gcc48 directory.
 #
-_GCC_PKGBASE=		gcc48-cc++
-.  if !empty(PKGPATH:Mlang/gcc48-cc++)
+_GCC_PKGBASE=		gcc48
+.  if !empty(PKGPATH:Mlang/gcc48)
 _IGNORE_GCC=		yes
 MAKEFLAGS+=		_IGNORE_GCC=yes
 .  endif
-.  if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc:Mc++)
-_GCC_PKGSRCDIR=		../../lang/gcc48-cc++
-_GCC_DEPENDENCY=	gcc48-cc++>=${_GCC_REQD}:../../lang/gcc48-cc++
+.  if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
+_GCC_PKGSRCDIR=		../../lang/gcc48
+_GCC_DEPENDENCY=	gcc48>=${_GCC_REQD}:../../lang/gcc48
+.    if !empty(_LANGUAGES.gcc:Mc++) || \
+        !empty(_LANGUAGES.gcc:Mfortran) || \
+        !empty(_LANGUAGES.gcc:Mfortran77) || \
+        !empty(_LANGUAGES.gcc:Mgo) || \
+        !empty(_LANGUAGES.gcc:Mobjc) || \
+        !empty(_LANGUAGES.gcc:Mobj-c++)
 _USE_GCC_SHLIB?=	yes
+.    endif
 .  endif
-.elif !empty(_NEED_GCC49:M[yY][eE][sS])
+.elif !empty(_NEED_GCC48:M[yY][eE][sS])
 #
 # We require gcc-4.9.x in the lang/gcc49-* directory.
 #
@@ -550,28 +557,6 @@ _USE_GCC_SHLIB?=	yes
 .  endif
 .endif
 
-.if !empty(_NEED_GCC48:M[yY][eE][sS])
-.  if !empty(PKGPATH:Mlang/gcc48-fortran)
-_IGNORE_GCC48FORTRAN=	yes
-MAKEFLAGS+=		_IGNORE_GCC48FORTRAN=yes
-.  endif
-.  if !defined(_IGNORE_GCC48FORTRAN) && \
-	(!empty(_LANGUAGES.gcc:Mfortran77) || !empty(_LANGUAGES.gcc:Mfortran))
-_GCC_PKGSRCDIR+=	../../lang/gcc48-fortran
-_GCC_DEPENDENCY+=	gcc48-fortran>=${_GCC_REQD}:../../lang/gcc48-fortran
-_USE_GCC_SHLIB?=	yes
-.  endif
-.  if !empty(PKGPATH:Mlang/gcc48-objc)
-_IGNORE_GCC3OBJC=	yes
-MAKEFLAGS+=		_IGNORE_GCC48OBJC=yes
-.  endif
-.  if !defined(_IGNORE_GCC48OBJC) && !empty(_LANGUAGES.gcc:Mobjc)
-_GCC_PKGSRCDIR+=	../../lang/gcc48-objc
-_GCC_DEPENDENCY+=	gcc48-objc>=${_GCC_REQD}:../../lang/gcc48-objc
-_USE_GCC_SHLIB?=	yes
-.  endif
-.endif
-
 # When not using the GNU linker, gcc will always link shared libraries against
 # the shared version of libgcc, and so _USE_GCC_SHLIB needs to be enabled on
 # platforms with non-GNU linkers, such as SunOS.
@@ -839,7 +824,7 @@ PREPEND_PATH+=	${_GCC_DIR}/bin
 # Add dependency on GCC libraries if requested.
 .if (defined(_USE_GCC_SHLIB) && !empty(_USE_GCC_SHLIB:M[Yy][Ee][Ss])) && !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
 #  Special case packages which are themselves a dependency of gcc runtime.
-.  if empty(PKGPATH:Mdevel/libtool-base) && empty(PKGPATH:Mdevel/binutils) && empty(PKGPATH:Mlang/gcc??) && empty(PKGPATH:Mlang/gcc48-*)
+.  if empty(PKGPATH:Mdevel/libtool-base) && empty(PKGPATH:Mdevel/binutils) && empty(PKGPATH:Mlang/gcc??)
 .    if !empty(CC_VERSION:Mgcc-4.7*)
 .      include "../../lang/gcc47-libs/buildlink3.mk"
 .    elif !empty(CC_VERSION:Mgcc-4.8*)
diff --git a/mk/compiler/gfortran.mk b/mk/compiler/gfortran.mk
deleted file mode 100644
index b4d0d6177e3..00000000000
--- a/mk/compiler/gfortran.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-# $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