Tue Sep 6 15:04:57 2016 UTC ()
gcc47: forgotten stray unconditional --enable-libssp


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

--- pkgsrc/lang/gcc47/Attic/Makefile 2016/09/06 12:00:33 1.38
+++ pkgsrc/lang/gcc47/Attic/Makefile 2016/09/06 15:04:57 1.39
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.38 2016/09/06 12:00:33 maya Exp $ 1# $NetBSD: Makefile,v 1.39 2016/09/06 15:04:57 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
@@ -76,27 +76,26 @@ CONFIGURE_ARGS+= --disable-libstdcxx-pch @@ -76,27 +76,26 @@ CONFIGURE_ARGS+= --disable-libstdcxx-pch
76.endif 76.endif
77 77
78.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) 78.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
79# on NetBSD, use the native SSP code in libc 79# on NetBSD, use the native SSP code in libc
80CONFIGURE_ARGS+= --disable-libssp 80CONFIGURE_ARGS+= --disable-libssp
81.else 81.else
82CONFIGURE_ARGS+= --enable-libssp 82CONFIGURE_ARGS+= --enable-libssp
83.endif 83.endif
84 84
85CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 85CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
86CONFIGURE_ARGS+= --enable-shared 86CONFIGURE_ARGS+= --enable-shared
87CONFIGURE_ARGS+= --enable-long-long 87CONFIGURE_ARGS+= --enable-long-long
88CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 88CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
89CONFIGURE_ARGS+= --enable-libssp 
90CONFIGURE_ARGS+= --enable-threads=posix 89CONFIGURE_ARGS+= --enable-threads=posix
91CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} 90CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
92 91
93CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 92CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
94CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 93CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as
95MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes 94MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes
96MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no 95MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
97 96
98CONFIGURE_ARGS.DragonFly+= --disable-bootstrap 97CONFIGURE_ARGS.DragonFly+= --disable-bootstrap
99 98
100# See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to 99# See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to
101# create a stub library, not just to remove symbols, so we must not 100# create a stub library, not just to remove symbols, so we must not
102# let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the 101# let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the