summaryrefslogtreecommitdiff
path: root/lang/gcc47
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2014-07-24 12:43:20 +0000
committerjperkin <jperkin@pkgsrc.org>2014-07-24 12:43:20 +0000
commit9b7a108402d8accde2c61100c0cdeb10dc01bfb8 (patch)
tree348ae26afdeb0f3b7e46f9e8927e45c1762dd7de /lang/gcc47
parentfa51235d66d618024169b60de2927c46e83d9147 (diff)
downloadpkgsrc-9b7a108402d8accde2c61100c0cdeb10dc01bfb8.tar.gz
Don't pass --enable-__cxa_atexit on SunOS, it is only available in newer
illumos releases and appears to cause issues there, seen most clearly in qt3 uic segfaults. Bump PKGREVISION of both gcc47 and gcc47-libs, gcc47-libs by more than one as it has lagged behind and must be kept ahead of gcc47.
Diffstat (limited to 'lang/gcc47')
-rw-r--r--lang/gcc47/Makefile4
-rw-r--r--lang/gcc47/options.mk4
2 files changed, 5 insertions, 3 deletions
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index ba0f76d60a3..beb1f0059ff 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/05/29 23:36:42 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2014/07/24 12:43:20 jperkin Exp $
GCC_PKGNAME= gcc47
.include "version.mk"
@@ -8,7 +8,7 @@ PKGNAME= ${GCC_PKGNAME}-${GCC47_DIST_VERSION}
## When bumping the PKGREVISION of this package the PKGREVISION of
## lang/gcc47-libs needs to be bump to be at least 1 more than the
## PKGREVISION of this package!
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC47_DIST_VERSION}/}
EXTRACT_SUFX= .tar.bz2
diff --git a/lang/gcc47/options.mk b/lang/gcc47/options.mk
index d77e27b397c..98e16e0ca2e 100644
--- a/lang/gcc47/options.mk
+++ b/lang/gcc47/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2013/04/02 09:57:51 jperkin Exp $
+# $NetBSD: options.mk,v 1.11 2014/07/24 12:43:20 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \
@@ -161,7 +161,9 @@ LANGS+= fortran
.if !empty(PKG_OPTIONS:Mgcc-c++)
LANGS+= c++
USE_TOOLS+= perl
+.if ${OPSYS} != "SunOS"
CONFIGURE_ARGS+= --enable-__cxa_atexit
+.endif
CONFIGURE_ARGS+= --with-gxx-include-dir=${GCC_PREFIX}/include/c++/
.else
CONFIGURE_ARGS+= --disable-build-with-cxx