summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2012-05-23 06:32:50 +0000
committerfhajny <fhajny@pkgsrc.org>2012-05-23 06:32:50 +0000
commitbecc3169eff87c3b882a569b9289341f107639fd (patch)
treef3d5f59ce208f57d31dfc5e5bc0391d8565919a3
parente5eb03a5f6a68126196ec7eba56e8f3b890015f8 (diff)
downloadpkgsrc-becc3169eff87c3b882a569b9289341f107639fd.tar.gz
Fix segfaults in timeout.rb manifest with GCC 4.7 and default optimizations.
See https://bugs.ruby-lang.org/issues/6383 for more.
-rw-r--r--lang/ruby18-base/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 0ac3d52ac2a..6839f817478 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2012/03/21 15:40:12 taca Exp $
+# $NetBSD: Makefile,v 1.71 2012/05/23 06:32:50 fhajny Exp $
#
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION= 1
CATEGORIES= lang ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
@@ -51,6 +52,11 @@ LIBS.SunOS+= -lm
CONFIGURE_ARGS+= --enable-frame-address
.endif
+# Avoid segfaults as per https://bugs.ruby-lang.org/issues/6383
+.if !empty(CC_VERSION:Mgcc-4.[7-9].*)
+CFLAGS+= -fno-tree-dce -fno-optimize-sibling-calls
+.endif
+
# Ruby build process depends on config.status's content
CONFIG_STATUS_OVERRIDE= # empty