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

8 files changed, 278 insertions, 118 deletions

diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 15cbbf5a3dc..24222eef01a 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/01/14 19:32:52 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2014/04/22 20:46:41 ryoon Exp $
 
 GCC_PKGNAME=	gcc48
 .include	"version.mk"
@@ -8,7 +8,7 @@ PKGNAME=	${GCC_PKGNAME}-${GCC48_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc48-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/gcc48/Makefile.common b/lang/gcc48/Makefile.common
new file mode 100644
index 00000000000..eb86e2cf9ce
--- /dev/null
+++ b/lang/gcc48/Makefile.common
@@ -0,0 +1,146 @@
+# $NetBSD: Makefile.common,v 1.1 2014/04/22 20:46:41 ryoon Exp $
+
+GCC_PKGNAME=	gcc48
+.include	"../../lang/gcc48/version.mk"
+
+DISTNAME=	gcc-${GCC48_DIST_VERSION}
+## When bumping the PKGREVISION of this package the PKGREVISION of
+## lang/gcc48-* needs to be bump to be at least 1 more than the
+## PKGREVISION of this package!
+CATEGORIES=	lang
+MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	sbd@NetBSD.org
+HOMEPAGE=	http://gcc.gnu.org/
+LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
+
+DISTFILES=		${DEFAULT_DISTFILES}
+EXTRACT_ONLY=		${DEFAULT_DISTFILES}
+
+DISTINFO_FILE=		${.CURDIR}/../../lang/gcc48/distinfo
+PATCHDIR=		${.CURDIR}/../../lang/gcc48/patches
+
+NOT_FOR_PLATFORM=	Interix-*-*
+
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake makeinfo sed:run
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+## Build outside ${WRKSRC}
+OBJDIR=			../build
+CONFIGURE_DIRS=		${OBJDIR}
+CONFIGURE_SCRIPT=	../${DISTNAME}/configure
+GCC_SUBPREFIX=		${GCC_PKGNAME}
+GCC_PREFIX=		${PREFIX}/${GCC_SUBPREFIX}
+GNU_CONFIGURE_PREFIX=	${GCC_PREFIX}
+INFO_FILES=		yes
+
+PLIST_VARS+=		java
+JAVA_MACHINE_ARCH=	${MACHINE_ARCH:S/x86_64/amd64/}
+PLIST_SUBST+=		JAVA_MACHINE_ARCH=${JAVA_MACHINE_ARCH}
+
+# Errors in libgo/runtime/runtime.h
+#BUILDLINK_TRANSFORM+=	rm:-Werror
+# segfault of gcj (Java) related programs
+#BUILDLINK_TRANSFORM+=	rename:-O2:-O1
+
+UNLIMIT_RESOURCES+=	datasize
+UNLIMIT_RESOURCES+=	stacksize
+
+SUBST_CLASSES+=		vars
+SUBST_MESSAGE.vars=	Setting target machine name path in ${SUBST_FILES.vars}
+SUBST_STAGE.vars=	pre-configure
+SUBST_FILES.vars=	gcc/Makefile.in
+SUBST_VARS.vars=	GCC_TARGET_MACHINE
+
+.include "../../mk/bsd.prefs.mk"
+
+# In some cases LINKER_RPATH_FLAG needs a trailing space.
+LINKER_RPATH_FLAG:=	${LINKER_RPATH_FLAG:S/-rpath/& /}
+
+## The Library rpath to use in end programs.
+LDFLAGS_FOR_TARGET=	${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
+
+# The "-static-libstdc++ -static-libgcc" flags are normally added to the
+# boot-ldflags by configure but because we are supply the boot-ldflags
+# we mash supply them.
+BOOT_LDFLAGS=		-static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET}
+# Needed on Darwin when LDFLAGS point to a SDK
+BOOT_LDFLAGS+=		${LDFLAGS:M-Wl,-syslibroot*}
+# GCC does not understand this option; remove it, or stage build will fail
+BUILDLINK_TRANSFORM+=	rm:-stdlib=libc++
+
+## For target librarys and libjava programs.
+CONFIGURE_ENV+=		LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
+
+CONFIGURE_ARGS+=	--enable-languages=${LANGS:S/ /,/g:Q}
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--enable-long-long
+CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
+CONFIGURE_ARGS+=	--enable-libssp
+CONFIGURE_ARGS+=	--enable-threads=posix
+CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
+.if ${OPSYS} == "NetBSD"
+#CONFIGURE_ARGS+=	--disable-lto
+CONFIGURE_ARGS+=	--with-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/bin/as
+MAKE_ENV+=		ac_cv_func_clock_gettime=yes
+# for libjava's configure script
+MAKE_ENV+=		ac_cv_func_gethostbyname_r=no
+.endif
+.if ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+=	--disable-bootstrap
+.endif
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
+CONFIGURE_ARGS+=	--with-arch=i486 --with-tune=i486
+.endif
+
+# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
+# a binary so we need to make sure we give it the installed sed and not
+# the tool wrapped one.
+MAKE_ENV+=		ac_cv_path_SED=${TOOLS_SED}
+MAKE_ENV+=		lt_cv_path_SED=${TOOLS_SED}
+
+# Determine whether to use binutils
+.if ${OPSYS} == "SunOS"
+.  if exists(/usr/sfw/bin/gobjdump)
+CONFIGURE_ENV+=		OBJDUMP=/usr/sfw/bin/gobjdump
+.  endif
+.  if exists(/usr/bin/ld)
+CONFIGURE_ARGS+=	--without-gnu-ld --with-ld=/usr/bin/ld
+.  else
+CONFIGURE_ARGS+=	--without-gnu-ld --with-ld=/usr/ccs/bin/ld
+.  endif
+.  if exists(/usr/sfw/bin/gas)
+CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/sfw/bin/gas
+.  elif exists(/usr/ccs/bin/as)
+CONFIGURE_ARGS+=	--without-gnu-as --with-as=/usr/ccs/bin/as
+.  else
+BUILDLINK_DEPMETHOD.binutils=	full
+.    include "../../devel/binutils/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gnu-as --with-as=${PREFIX}/bin/gas
+.  endif
+.endif
+
+pre-configure:
+	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
+
+TEST_TARGET=	-k check || ${TRUE}
+pre-test:
+	${RUN} 							\
+	if runtest --version >/dev/null 2>/dev/null ; then	\
+		: ;						\
+	else							\
+	  ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
+	  exit 1 ;						\
+	fi
+post-test:
+	${RUN} cd ${WRKSRC} && cd ${OBJDIR} &&		\
+	${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
+	@${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
+
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc48/c++.mk b/lang/gcc48/c++.mk
new file mode 100644
index 00000000000..d05e15d568f
--- /dev/null
+++ b/lang/gcc48/c++.mk
@@ -0,0 +1,8 @@
+# $NetBSD: c++.mk,v 1.1 2014/04/22 20:46:41 ryoon Exp $
+
+# Objective C and Objective C++ enabled gcc should be built.
+LANGS+=			c c++ objc obj-c++
+
+USE_TOOLS+=		perl
+CONFIGURE_ARGS+=	--enable-__cxa_atexit
+CONFIGURE_ARGS+=	--with-gxx-include-dir=${GCC_PREFIX}/include/c++/
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index bce8d582007..f6855426c42 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2014/04/08 06:20:42 asau Exp $
+$NetBSD: distinfo,v 1.15 2014/04/22 20:46:41 ryoon Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -9,7 +9,7 @@ Size (gcc-4.8.2.tar.bz2) = 85999682 bytes
 SHA1 (patch-gcc-config-vax-constraints.md) = e6cea7a5334b5b124ca3e8b62eba45423e788e55
 SHA1 (patch-gcc-config-vax-vax.c) = 02e389ec418a0fee1431ecd61d65b7f8d7629785
 SHA1 (patch-gcc-config-vax-vax.md) = e06696be85641cbe9131ecc10bb28c45a465916d
-SHA1 (patch-gcc_Makefile.in) = b2bceb34537de1cf704f18a59aa4e4d4a4551c62
+SHA1 (patch-gcc_Makefile.in) = 3706889f55dac4f2847301340d95fc11645108eb
 SHA1 (patch-gcc_config.gcc) = ac175c5eecf3dd53508479b30bf5c59cc0a5fca9
 SHA1 (patch-gcc_config.host) = 1b1e11cd199eb93f49443d51c0063b09b7327858
 SHA1 (patch-gcc_config_dragonfly-stdint.h) = 740dc819b446d5f1476506322c4b280ffdb5a6c0
@@ -31,7 +31,7 @@ SHA1 (patch-libgcc_crtstuff.c) = 88500ea895cd683608f8f2b7177149f11947e3b4
 SHA1 (patch-libgcc_unwind-dw2-fde-dip.c) = 770f04f3cbeb0d794fa297b328f06f6e687419c0
 SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3
 SHA1 (patch-libjava_boehm.cc) = b18bc9d410a62543583c77e011f50b86f41ca18a
-SHA1 (patch-libjava_configure) = 48ea2baffe87e09dda8133d286bd9b1bfe4c3f8a
+SHA1 (patch-libjava_configure) = 9c83d60e155d6a9aac542d65ff195a99c5c764ff
 SHA1 (patch-libjava_contrib_rebuild-gcj-db.in) = bb01d738fc7db05046ae37e8ade32574de1d8297
 SHA1 (patch-libsanitizer_configure.tgt) = a56ba5e2dc6bc413e80358353af16e6910b0e106
 SHA1 (patch-libstdc++-v3_config_locale_dragonfly_c__locale.cc) = 5c0ccc6b90e3508b03ed399e8e9e300a6aa9cbb7
diff --git a/lang/gcc48/java.mk b/lang/gcc48/java.mk
new file mode 100644
index 00000000000..b227c20487c
--- /dev/null
+++ b/lang/gcc48/java.mk
@@ -0,0 +1,53 @@
+# $NetBSD: java.mk,v 1.1 2014/04/22 20:46:41 ryoon Exp $
+
+LANGS+=			java
+USE_TOOLS+=		perl
+
+# Add the  Eclipse Java compiler for to parse `.java' source files.
+ECJ_JAR=		ecj-4.5.jar
+SITES.${ECJ_JAR}=	ftp://sourceware.org/pub/java/
+DISTFILES+=		${ECJ_JAR}
+CONFIGURE_ARGS+=	--with-ecj-jar=${DISTDIR:Q}/${ECJ_JAR:Q}
+
+JAVA_NAME=		${GCC_PKGNAME}
+JAVA_HOME=		${PREFIX}/java/${JAVA_NAME}
+.if !empty(PKGPATH:Mlang/gcc48-java)
+JAVA_WRAPPERS=		appletviewer jar jarsigner java javah keytool \
+			native2ascii orbd rmic rmid rmiregistry serialver \
+			tnameserv
+.endif
+
+JAVA_ARCH=		${MACHINE_ARCH:S/x86_64/amd64/}
+
+PLIST_SUBST+=		JAVA_NAME=${JAVA_NAME:Q}
+PLIST_SUBST+=		JAVA_ARCH=${JAVA_ARCH:Q}
+
+# Create a JPackage compatible SDK environment.
+CONFIGURE_ARGS+=	--enable-java-home
+CONFIGURE_ARGS+=	--with-os-directory=${LOWER_OPSYS:Q}
+CONFIGURE_ARGS+=	--with-arch-directory=${JAVA_ARCH:Q}
+CONFIGURE_ARGS+=	--with-jvm-root-dir=${JAVA_HOME:Q}
+CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME:Q}
+
+REPLACE_PYTHON=		libjava/contrib/aot-compile.in
+
+USE_TOOLS+=		unzip zip:run gmake:run
+CONFIGURE_ARGS+=	--with-system-zlib
+
+# libjava/contrib/aotcompile.py.in stores the path to a 'make' program so
+# we need to make sure we give it the installed 'make' and not the tool
+# wrapped one.
+CONFIGURE_ENV+=		PKGSRC_MAKE=${TOOLS_PATH.gmake}
+MAKE_ENV+=		PKGSRC_MAKE=${TOOLS_PATH.gmake}
+
+# fastjar-0.93 from pkgsrc/archivers/fastjar seems to trigger a build
+# failure (seen on NetBSD-5.0/i386) when building java.  So in case
+# the fastjar package is installed, make sure the configure script
+# doesn't pick it up.
+CONFIGURE_ENV+=		JAR=no
+MAKE_ENV+=		JAR=no
+MAKE_ENV+=		ac_cv_prog_JAR=no
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/java-env.mk"
diff --git a/lang/gcc48/options.mk b/lang/gcc48/options.mk
index edcd0aa80ba..2a87c39d885 100644
--- a/lang/gcc48/options.mk
+++ b/lang/gcc48/options.mk
@@ -1,20 +1,24 @@
-# $NetBSD: options.mk,v 1.1 2013/04/01 21:06:15 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2014/04/22 20:46:41 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${GCC_PKGNAME}
-PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \
-			gcc-go gcc-objc gcc-objc++ gcc-graphite
-PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-objc gcc-objc++ gcc-graphite
+PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-graphite gcc-java
+PKG_SUGGESTED_OPTIONS=	gcc-graphite
+
+.include "../../mk/bsd.prefs.mk"
+
+# amd64 is for OpenBSD/amd64
+.if (!empty(MACHINE_ARCH:Mx86_64) || !empty(MACHINE_ARCH:Mamd64) || \
+	!empty(MACHINE_ARCH:Mi386)) && \
+	(!empty(PKGPATH:Mlang/gcc48-libs) || !empty(PKGPATH:Mlang/gcc48-java))
+.include "../../lang/gcc48/java.mk"
+PKG_SUGGESTED_OPTIONS+=		gcc-java
+PLIST.java=			yes
+.endif
 
-.if ${OPSYS} == "NetBSD" 
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly"
 PKG_SUGGESTED_OPTIONS+=	nls
-.elif ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	nls gcc-java
-.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= nls
 .elif ${OPSYS} == "SunOS"
 PKG_SUGGESTED_OPTIONS+=	gcc-inplace-math
-.else
-PKG_SUGGESTED_OPTIONS+= gcc-java
 .endif
 
 ###
@@ -34,8 +38,6 @@ PKG_SUPPORTED_OPTIONS+=	gcc-multilib
 PKG_SUGGESTED_OPTIONS+=	gcc-multilib
 .endif
 
-.include "../../mk/bsd.options.mk"
-
 ###
 ### Native Language Support
 ###
@@ -87,96 +89,4 @@ CONFIGURE_ARGS+=	--enable-cloog-backend=isl
 .include "../../math/isl/buildlink3.mk"
 .endif
 
-###
-### Optional languages
-### Ada could be added although there is a bootstrapping issue.  See
-### ../gcc34-ada for guidance
-###
-
-.if !empty(PKG_OPTIONS:Mgcc-objc++)
-.  if empty(PKG_OPTIONS:Mgcc-c++)
-PKG_OPTIONS+=		gcc-c++
-.  endif
-.  if empty(PKG_OPTIONS:Mgcc-objc)
-PKG_OPTIONS+=		gcc-objc
-.  endif
-LANGS+=			obj-c++
-.endif
-
-.if !empty(PKG_OPTIONS:Mgcc-objc)
-LANGS+=			objc
-.endif
-
-.if !empty(PKG_OPTIONS:Mgcc-java)
-.  if empty(PKG_OPTIONS:Mgcc-c++)
-PKG_OPTIONS+=		gcc-c++
-.  endif
-
-LANGS+=			java
-
-# Add the  Eclipse Java compiler for to parse `.java' source files.
-ECJ_JAR=		ecj-4.5.jar
-SITES.${ECJ_JAR}=	ftp://sourceware.org/pub/java/
-DISTFILES+=		${ECJ_JAR}
-CONFIGURE_ARGS+=	--with-ecj-jar=${DISTDIR:Q}/${ECJ_JAR:Q}
-
-JAVA_NAME=		${GCC_PKGNAME}
-JAVA_HOME=		${PREFIX}/java/${JAVA_NAME}
-JAVA_WRAPPERS=		appletviewer jar jarsigner java javah keytool \
-			native2ascii orbd rmic rmid rmiregistry serialver \
-			tnameserv
-
-JAVA_ARCH=		${MACHINE_ARCH:S/x86_64/amd64/}
-
-PLIST_SRC+=		PLIST.java
-PLIST_SUBST+=		JAVA_NAME=${JAVA_NAME:Q}
-PLIST_SUBST+=		JAVA_ARCH=${JAVA_ARCH:Q}
-
-# Create a JPackage compatible SDK environment.
-CONFIGURE_ARGS+=	--enable-java-home
-CONFIGURE_ARGS+=	--with-os-directory=${LOWER_OPSYS:Q}
-CONFIGURE_ARGS+=	--with-arch-directory=${JAVA_ARCH:Q}
-CONFIGURE_ARGS+=	--with-jvm-root-dir=${JAVA_HOME:Q}
-CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME:Q}
-
-REPLACE_PYTHON=		libjava/contrib/aot-compile.in
-
-USE_TOOLS+=		unzip zip:run gmake:run
-CONFIGURE_ARGS+=	--with-system-zlib
-
-# libjava/contrib/aotcompile.py.in stores the path to a 'make' program so
-# we need to make sure we give it the installed 'make' and not the tool
-# wrapped one.
-CONFIGURE_ENV+=		PKGSRC_MAKE=${TOOLS_PATH.gmake}
-MAKE_ENV+=		PKGSRC_MAKE=${TOOLS_PATH.gmake}
-
-# fastjar-0.93 from pkgsrc/archivers/fastjar seems to trigger a build
-# failure (seen on NetBSD-5.0/i386) when building java.  So in case
-# the fastjar package is installed, make sure the configure script
-# doesn't pick it up.
-CONFIGURE_ENV+=		JAR=no
-MAKE_ENV+=		JAR=no
-MAKE_ENV+=		ac_cv_prog_JAR=no
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../mk/java-env.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mgcc-go)
-LANGS+=			go
-.endif
-
-.if !empty(PKG_OPTIONS:Mgcc-fortran)
-LANGS+=			fortran
-.endif
-
-.if !empty(PKG_OPTIONS:Mgcc-c++)
-LANGS+=			c++
-USE_TOOLS+=		perl
-CONFIGURE_ARGS+=	--enable-__cxa_atexit
-CONFIGURE_ARGS+=	--with-gxx-include-dir=${GCC_PREFIX}/include/c++/
-.else
-CONFIGURE_ARGS+=	--disable-build-with-cxx
-CONFIGURE_ARGS+=	--disable-build-poststage1-with-cxx
-.endif
+.include "../../mk/bsd.options.mk"
diff --git a/lang/gcc48/patches/patch-gcc_Makefile.in b/lang/gcc48/patches/patch-gcc_Makefile.in
index d1dfe3d3bbb..a22e9c60d7d 100644
--- a/lang/gcc48/patches/patch-gcc_Makefile.in
+++ b/lang/gcc48/patches/patch-gcc_Makefile.in
@@ -1,15 +1,41 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.2 2013/04/21 09:04:10 sbd Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.3 2014/04/22 20:46:41 ryoon Exp $
 
 Add gcc libdir to a programs rpath so that _this gcc's_ support libraries
 are found.
 
---- gcc/Makefile.in.orig	2013-03-05 09:46:34.000000000 +0000
+--- gcc/Makefile.in.orig	2013-07-08 09:14:34.000000000 +0000
 +++ gcc/Makefile.in
-@@ -2027,6 +2027,7 @@ prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_
+@@ -1733,8 +1733,11 @@ rest.encap: lang.rest.encap
+ # This is what is made with the host's compiler
+ # whether making a cross compiler or not.
+ native: config.status auto-host.h build-@POSUB@ $(LANGUAGES) \
+-	$(EXTRA_PROGRAMS) $(COLLECT2) lto-wrapper$(exeext) \
+-	gcc-ar$(exeext) gcc-nm$(exeext) gcc-ranlib$(exeext)
++	$(EXTRA_PROGRAMS) $(COLLECT2)
++
++ifeq ($(enable_lto),yes)
++native: lto-wrapper$(exeext) gcc-ar$(exeext) gcc-nm$(exeext) gcc-ranlib$(exeext)
++endif
+ 
+ ifeq ($(enable_plugin),yes)
+ native: gengtype$(exeext)
+@@ -2027,6 +2030,7 @@ prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_
  # Language-independent files.
  
  DRIVER_DEFINES = \
-+  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG)$(prefix)/@GCC_TARGET_MACHINE@/lib/%M $(LINKER_RPATH_FLAG)$(libdir)/%M \"" \
++  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG)$(prefix)//lib/%M $(LINKER_RPATH_FLAG)$(libdir)/%M \"" \
    -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
    -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
+@@ -4556,7 +4560,10 @@ maintainer-clean:
+ # broken is small.
+ install: install-common $(INSTALL_HEADERS) \
+     install-cpp install-man install-info install-@POSUB@ \
+-    install-driver install-lto-wrapper install-gcc-ar
++    install-driver
++ifeq ($(enable_lto),yes)
++install: install-lto-wrapper install-gcc-ar
++endif
+ 
+ ifeq ($(enable_plugin),yes)
+ install: install-plugin
diff --git a/lang/gcc48/patches/patch-libjava_configure b/lang/gcc48/patches/patch-libjava_configure
index 65896e337a4..874233b7dd6 100644
--- a/lang/gcc48/patches/patch-libjava_configure
+++ b/lang/gcc48/patches/patch-libjava_configure
@@ -1,12 +1,29 @@
-$NetBSD: patch-libjava_configure,v 1.1 2013/04/01 21:06:17 wiz Exp $
+$NetBSD: patch-libjava_configure,v 1.2 2014/04/22 20:46:41 ryoon Exp $
+
+Detect gethostbyname_r properly.
 
 Avoid a reference to the wrapped make in the pkgsrc work directory from
 showing up in an installed file.
 See: libjava/contrib/aotcompile.py.in
 
---- libjava/configure.orig	2012-03-22 07:37:39.000000000 +0000
+--- libjava/configure.orig	2013-06-20 13:12:44.000000000 +0000
 +++ libjava/configure
-@@ -24692,7 +24692,7 @@ $as_echo "Python modules dir: ${python_m
+@@ -22014,6 +22014,14 @@ do :
+ if test "x$ac_cv_func_gethostbyname_r" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETHOSTBYNAME_R 1
++#include <netdb.h>
++int
++main ()
++{
++gethostbyname_r("", 0, 0);
++;
++return 0;
++}
+ _ACEOF
+ 
+ 
+@@ -24867,7 +24875,7 @@ $as_echo "Python modules dir: ${python_m
  
  
  # needed for aot-compile-rpm