Thu Dec 22 10:03:07 2016 UTC ()
gcc47: add USE_LANGUAGES c++ so less warnings about configure using the
c++ compiler.
pass LANG+=c++ only once (from options.mk), doing it twice seems to confuse
the configure script.

now I can pass configure on NetBSD-6.


(maya)
diff -r1.41 -r1.42 pkgsrc/lang/gcc47/Makefile
cvs diff -r1.41 -r1.42 pkgsrc/lang/gcc47/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc47/Attic/Makefile 2016/10/31 04:10:38 1.41
+++ pkgsrc/lang/gcc47/Attic/Makefile 2016/12/22 10:03:07 1.42
@@ -1,63 +1,64 @@ @@ -1,63 +1,64 @@
1# $NetBSD: Makefile,v 1.41 2016/10/31 04:10:38 dholland Exp $ 1# $NetBSD: Makefile,v 1.42 2016/12/22 10:03:07 maya Exp $
2 2
3GCC_PKGNAME= gcc47 3GCC_PKGNAME= gcc47
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC47_DIST_VERSION} 6DISTNAME= gcc-${GCC47_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC47_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC47_DIST_VERSION}
8## When bumping the PKGREVISION of this package the PKGREVISION of 8## When bumping the PKGREVISION of this package the PKGREVISION of
9## lang/gcc47-libs needs to be bump to be at least 1 more than the 9## lang/gcc47-libs needs to be bump to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
11PKGREVISION= 3 11PKGREVISION= 3
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC47_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC47_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= sbd@NetBSD.org 16MAINTAINER= sbd@NetBSD.org
17HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 4.7 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 4.7 Release Series
19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
20 20
21DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
22EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
23 23
24NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
25 25
 26USE_LANGUAGES+= c c++
26USE_TOOLS+= gmake makeinfo sed:run perl 27USE_TOOLS+= gmake makeinfo sed:run perl
27GCC_REQD+= 4.4 28GCC_REQD+= 4.4
28 29
29GNU_CONFIGURE= yes 30GNU_CONFIGURE= yes
30## Build outside ${WRKSRC} 31## Build outside ${WRKSRC}
31OBJDIR= ../build 32OBJDIR= ../build
32CONFIGURE_DIRS= ${OBJDIR} 33CONFIGURE_DIRS= ${OBJDIR}
33CONFIGURE_SCRIPT= ../${DISTNAME}/configure 34CONFIGURE_SCRIPT= ../${DISTNAME}/configure
34GCC_SUBPREFIX= ${GCC_PKGNAME} 35GCC_SUBPREFIX= ${GCC_PKGNAME}
35GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 36GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
36GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} 37GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
37GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 38GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
38INFO_FILES= yes 39INFO_FILES= yes
39 40
40UNLIMIT_RESOURCES+= datasize 41UNLIMIT_RESOURCES+= datasize
41UNLIMIT_RESOURCES+= stacksize 42UNLIMIT_RESOURCES+= stacksize
42 43
43SUBST_CLASSES+= vars 44SUBST_CLASSES+= vars
44SUBST_STAGE.vars= pre-configure 45SUBST_STAGE.vars= pre-configure
45SUBST_FILES.vars= gcc/Makefile.in 46SUBST_FILES.vars= gcc/Makefile.in
46SUBST_VARS.vars= GCC_TARGET_MACHINE 47SUBST_VARS.vars= GCC_TARGET_MACHINE
47 48
48.include "../../mk/bsd.prefs.mk" 49.include "../../mk/bsd.prefs.mk"
49 50
50LANGS= c c++ 51LANGS= c
51 52
52# In some cases LINKER_RPATH_FLAG needs a trailing space. 53# In some cases LINKER_RPATH_FLAG needs a trailing space.
53LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /} 54LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /}
54 55
55## The Library rpath to use in end programs. 56## The Library rpath to use in end programs.
56LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} 57LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
57 58
58# The "-static-libstdc++ -static-libgcc" flags are normally added to the 59# The "-static-libstdc++ -static-libgcc" flags are normally added to the
59# boot-ldflags by configure but because we are supply the boot-ldflags 60# boot-ldflags by configure but because we are supply the boot-ldflags
60# we mash supply them. 61# we mash supply them.
61BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET} 62BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET}
62# Needed on Darwin when LDFLAGS point to a SDK 63# Needed on Darwin when LDFLAGS point to a SDK
63BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*} 64BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}