summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2014-02-25 04:18:07 +0000
committerSteve Wills <swills@FreeBSD.org>2014-02-25 04:18:07 +0000
commit4d921409e292599df48569f4439ce7dc7d6be726 (patch)
tree702131052bd341c4a93ef09faf5dd53e03b4e4f0 /lang
parentUpdate to 0.9.9.5.411 (diff)
- Add patch to fix build on 11-CURRENT after Clang 3.4 import. No need to
conditionalize this on OSVER because the patch is safe everywhere. No bump because package doesn't change. Submitted by: antoine (1.9, 2.0 and 2.1 based on)
Notes
Notes: svn path=/head/; revision=345917
Diffstat (limited to 'lang')
-rw-r--r--lang/ruby19/files/patch-ext__dl__extconf.rb12
-rw-r--r--lang/ruby20/files/patch-ext__dl__extconf.rb11
-rw-r--r--lang/ruby21/files/patch-ext__dl__extconf.rb11
3 files changed, 34 insertions, 0 deletions
diff --git a/lang/ruby19/files/patch-ext__dl__extconf.rb b/lang/ruby19/files/patch-ext__dl__extconf.rb
new file mode 100644
index 000000000000..fee2d05b62ec
--- /dev/null
+++ b/lang/ruby19/files/patch-ext__dl__extconf.rb
@@ -0,0 +1,12 @@
+--- ./ext/dl/extconf.rb.orig 2010-02-25 22:49:20.000000000 +0000
++++ ./ext/dl/extconf.rb 2014-02-18 22:06:44.000000000 +0000
+@@ -1,7 +1,8 @@
+ require 'mkmf'
+
+ if RbConfig::CONFIG['GCC'] == 'yes'
+- $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer"
++ $CFLAGS << " -fno-defer-pop" unless have_macro("__clang__")
++ $CFLAGS << " -fno-omit-frame-pointer"
+ end
+
+ $INSTALLFILES = [
diff --git a/lang/ruby20/files/patch-ext__dl__extconf.rb b/lang/ruby20/files/patch-ext__dl__extconf.rb
new file mode 100644
index 000000000000..bddc2036ae85
--- /dev/null
+++ b/lang/ruby20/files/patch-ext__dl__extconf.rb
@@ -0,0 +1,11 @@
+--- ext/dl/extconf.rb.orig 2014-02-24 15:49:13.436431209 +0000
++++ ext/dl/extconf.rb 2014-02-24 15:50:21.287476923 +0000
+@@ -1,7 +1,7 @@
+ require 'mkmf'
+
+ if RbConfig::CONFIG['GCC'] == 'yes'
+- (have_macro("__clang__") ? $LDFLAGS : $CFLAGS) << " -fno-defer-pop"
++ $CFLAGS << " -fno-defer-pop" unless have_macro("__clang__")
+ $CFLAGS << " -fno-omit-frame-pointer"
+ end
+
diff --git a/lang/ruby21/files/patch-ext__dl__extconf.rb b/lang/ruby21/files/patch-ext__dl__extconf.rb
new file mode 100644
index 000000000000..bddc2036ae85
--- /dev/null
+++ b/lang/ruby21/files/patch-ext__dl__extconf.rb
@@ -0,0 +1,11 @@
+--- ext/dl/extconf.rb.orig 2014-02-24 15:49:13.436431209 +0000
++++ ext/dl/extconf.rb 2014-02-24 15:50:21.287476923 +0000
+@@ -1,7 +1,7 @@
+ require 'mkmf'
+
+ if RbConfig::CONFIG['GCC'] == 'yes'
+- (have_macro("__clang__") ? $LDFLAGS : $CFLAGS) << " -fno-defer-pop"
++ $CFLAGS << " -fno-defer-pop" unless have_macro("__clang__")
+ $CFLAGS << " -fno-omit-frame-pointer"
+ end
+