Split gcc48 to libraries and langusages packages

* All gcc48-* depend on gcc48-libs
* Add gcc48-cc++, gcc48-fortran, and gcc48-objc
* gcc48 is meta package now

4 files changed, 100 insertions, 61 deletions

diff --git a/lang/gcc48-libs/DESCR b/lang/gcc48-libs/DESCR
index 67396068e82..a6bfe8421e9 100644
--- a/lang/gcc48-libs/DESCR
+++ b/lang/gcc48-libs/DESCR
@@ -1,3 +1 @@
-The GNU Compiler Collection (GCC) includes front ends for C, C++, Objective-C,
-Fortran, and Go, as well as libraries for these languages (libstdc++,
-libgfortran, ...).
+The runtime libraries from the GNU Compiler Collection (GCC) 4.8 release branch.
diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile
index f18f205d6ba..b7d4efd818e 100644
--- a/lang/gcc48-libs/Makefile
+++ b/lang/gcc48-libs/Makefile
@@ -1,66 +1,94 @@
-# $NetBSD: Makefile,v 1.10 2014/01/14 19:33:10 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/04/22 20:46:41 ryoon Exp $
 
-GCC_PKGNAME=	gcc48
-.include	"../../lang/${GCC_PKGNAME}/version.mk"
-
-DISTNAME=	gcc-${GCC48_DIST_VERSION}
 PKGNAME=	${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION}
-## The PKGREVISION of this package needs to be at least 1 more than the
-## PKGREVISION of the lang/gcc48 package so that with the dependence pattern
-## '{gcc48,gcc48-libs}>=4.8.*' pkg_all will choose gcc48-libs over gcc48.
-PKGREVISION=	2
-CATEGORIES=	lang
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-
-MAINTAINER=	sbd@NetBSD.org
-HOMEPAGE=	http://gcc.gnu.org/
-COMMENT=	The GNU Compiler Collection (GCC) support shared libraries.
-LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
+PKGREVISION=	3
 
-USE_TOOLS+=		pax
+COMMENT=	Runtime libraries from the GNU Compiler Collection (GCC) 4.8
 
-NO_BUILD=		yes
+DISTINFO_FILE=		${.CURDIR}/../../lang/gcc48/distinfo
+PATCHDIR=		${.CURDIR}/../../lang/gcc48/patches
 
-## Depend on exactly ${GCC48_DIST_VERSION}.
-BUILD_DEPENDS+=		${GCC_PKGNAME}-${GCC48_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc48
+LANGS=			fortran
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../lang/gcc48/options.mk"
 
-FIND_PREFIX:=		GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC48_DIST_VERSION}*
-.include "../../mk/find-prefix.mk"
+.include "../../lang/gcc48/c++.mk"
 
-LIBGCC_SUBPREFIX=	${GCC_PKGNAME}
-LIBGCC_PREFIX=		${GCC_PKG_PREFIX}/${LIBGCC_SUBPREFIX}
-GCC_TARGET_MACHINE?=	${MACHINE_GNU_PLATFORM}
-BUILD_DEFS+=		GCC_TARGET_MACHINE
+INSTALLATION_DIRS=	${GCC_PKGNAME}/lib \
+			${GCC_PKGNAME}/lib/gcj-${GCC48_DIST_VERSION}-14 \
+			${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}
 
-.include "../../mk/bsd.prefs.mk"
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
-SHLIB_EXT=	dylib
-.else
-SHLIB_EXT=	so
+.if !empty(PKG_OPTIONS:Mgcc-java)
+INSTALLATION_DIRS+=	java/${GCC_PKGNAME}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/client \
+			java/${GCC_PKGNAME}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server
 .endif
 
-LIBRARY_FILES=	${WRKDIR}/lib_files
+do-install:
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libatomic/libatomic.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+
+# libgcc_s has no libtool la file.
+	${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libgcc/libgcc_s.so* \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libgfortran/libgfortran.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libgomp/libgomp.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libitm/libitm.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libobjc/libobjc.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libstdc++-v3/src/libstdc++.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
 
-GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \
-			${LIBRARY_FILES};
-GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \
-	   ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ;
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libssp/libssp.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
 
-${LIBRARY_FILES}:
-	${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC48_DIST_VERSION}*' |	\
-	${SED} -n -e's,^${LIBGCC_PREFIX}/,,' -e'/libexec\//d'		\
-		-e'/libgij/d;/libgcj/d;/libjvm/d'			\
-		-e'/lib.*\.${SHLIB_EXT}/p' 		>${LIBRARY_FILES}
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/lto-plugin/liblto_plugin.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}
 
-do-install: ${LIBRARY_FILES}
-	${TEST} -d ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib || \
-		${MKDIR} ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib
-	cd ${LIBGCC_PREFIX} && 						\
-	  ${PAX} -rw ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE} <${LIBRARY_FILES}
+	${INSTALL_PROGRAM} ${WRKSRC}/${OBJDIR}/gcc/lto1 \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}
+
+	${INSTALL_PROGRAM} ${WRKSRC}/${OBJDIR}/gcc/lto-wrapper \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}
+
+.if !empty(PKG_OPTIONS:Mgcc-java)
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libjava/libjvm.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcj-${GCC48_DIST_VERSION}-14
+
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libjava/libgcj.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libjava/libgij.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libjava/libgcj-tools.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+
+	cd ${DESTDIR}${PREFIX}/java/${GCC_PKGNAME}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/client && \
+		${LN} -sf ../../../../../../${GCC_PKGNAME}/lib/gcj-${GCC48_DIST_VERSION}-14/libjvm.so .
+
+	cd ${DESTDIR}${PREFIX}/java/${GCC_PKGNAME}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server && \
+		${LN} -sf ../../../../../../${GCC_PKGNAME}/lib/gcj-${GCC48_DIST_VERSION}-14/libjvm.so .
+.endif
 
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
+.include	"../../lang/gcc48/Makefile.common"
diff --git a/lang/gcc48-libs/PLIST b/lang/gcc48-libs/PLIST
new file mode 100644
index 00000000000..540c99e3264
--- /dev/null
+++ b/lang/gcc48-libs/PLIST
@@ -0,0 +1,19 @@
+@comment $NetBSD: PLIST,v 1.1 2014/04/22 20:46:41 ryoon Exp $
+${PLIST.java}gcc48/lib/gcj-${PKGVERSION}-14/libjvm.la
+gcc48/lib/libatomic.la
+gcc48/lib/libgcc_s.so
+gcc48/lib/libgcc_s.so.1
+${PLIST.java}gcc48/lib/libgcj-tools.la
+${PLIST.java}gcc48/lib/libgcj.la
+gcc48/lib/libgfortran.la
+${PLIST.java}gcc48/lib/libgij.la
+gcc48/lib/libgomp.la
+gcc48/lib/libitm.la
+gcc48/lib/libobjc.la
+gcc48/lib/libssp.la
+gcc48/lib/libstdc++.la
+gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/liblto_plugin.la
+gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/lto-wrapper
+gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/lto1
+${PLIST.java}java/gcc48/jre/lib/${JAVA_MACHINE_ARCH}/client/libjvm.so
+${PLIST.java}java/gcc48/jre/lib/${JAVA_MACHINE_ARCH}/server/libjvm.so
diff --git a/lang/gcc48-libs/buildlink3.mk b/lang/gcc48-libs/buildlink3.mk
index 232d809f139..a4c9ab82cad 100644
--- a/lang/gcc48-libs/buildlink3.mk
+++ b/lang/gcc48-libs/buildlink3.mk
@@ -1,15 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.6 2013/08/15 06:50:24 richard Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2014/04/22 20:46:41 ryoon Exp $
 
 BUILDLINK_TREE+=	gcc48-libs
 
 .if !defined(GCC48_LIBS_BUILDLINK3_MK)
 GCC48_LIBS_BUILDLINK3_MK:=
 
-.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
 BUILDLINK_API_DEPENDS.gcc48-libs+=	gcc48-libs>=4.8.0
-.else
-BUILDLINK_API_DEPENDS.gcc48-libs+=	{gcc48,gcc48-libs}>=4.8.0
-.endif
 BUILDLINK_PKGSRCDIR.gcc48-libs=		../../lang/gcc48-libs
 BUILDLINK_DEPMETHOD.gcc48-libs?=	full
 
@@ -18,7 +14,6 @@ BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_PREFIX.gcc48-libs}/gcc48
 BUILDLINK_FILES.gcc48-libs=	#empty
 BUILDLINK_AUTO_VARS.gcc48-libs=	no
 
-.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
 # Use custom specs file to ensure we link against pkgsrc libraries.
 SPECS_LIBGCC=		${WRAPPER_DIR}/specs.libgcc
 WRAPPER_TARGETS+=	${SPECS_LIBGCC}
@@ -35,7 +30,6 @@ ${SPECS_LIBGCC}:
 _WRAP_EXTRA_ARGS.CC+=	-specs=${SPECS_LIBGCC}
 _WRAP_EXTRA_ARGS.CXX+=	-specs=${SPECS_LIBGCC}
 _WRAP_EXTRA_ARGS.FC+=	-specs=${SPECS_LIBGCC}
-.endif
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"