From 75a4a592e5ccda30715f93563d741b83e0dcf39e Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 25 Apr 2011 13:37:00 +0000
Subject: Slackware 13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!
---
 source/d/ruby/ruby.SlackBuild | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'source/d/ruby')

diff --git a/source/d/ruby/ruby.SlackBuild b/source/d/ruby/ruby.SlackBuild
index 0ff662102..c9a25654a 100755
--- a/source/d/ruby/ruby.SlackBuild
+++ b/source/d/ruby/ruby.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -42,13 +42,21 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-ruby
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  # -O3 works around a compile failure due to a miniruby segfault
+  # when trying to build ruby with gcc-4.4 or newer.  Evidently
+  # -O0 also works, but...
+  # other distributions also use -fno-strict-aliasing which helps stability
+  SLKCFLAGS="-march=i486 -mtune=i686 -O3 -fno-strict-aliasing"
+  OPTFLAGS=-O3
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+  # Unknown if s390 is needs -O3.  Check to see if it compiles with -O2.
+  SLKCFLAGS="-O3 -fno-strict-aliasing"
+  OPTFLAGS=-O3
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O3 -fPIC -fno-strict-aliasing"
+  OPTFLAGS=-O3
   LIBDIRSUFFIX="64"
 fi
 
@@ -70,6 +78,7 @@ find . \
 # Seems suboptimal to me... 
 
 CFLAGS="$SLKCFLAGS" \
+optflags=$OPTFLAGS \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-- 
cgit v1.2.3