[Frugalware-git] bmf: ruby-2.3.0-2-x86_64

Melko melko at frugalware.org
Sat Jan 23 11:19:09 CET 2016


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=f54ed98ba5a82eab93d5e8397dcdcf09a1b49ce7

commit f54ed98ba5a82eab93d5e8397dcdcf09a1b49ce7
Author: Melko <melko at frugalware.org>
Date:   Sat Jan 23 11:00:38 2016 +0100

ruby-2.3.0-2-x86_64

* add patch to disable __builtin_choose_expr on C++

diff --git a/source/devel/ruby/FrugalBuild b/source/devel/ruby/FrugalBuild
index 05d613c..ef3d34e 100644
--- a/source/devel/ruby/FrugalBuild
+++ b/source/devel/ruby/FrugalBuild
@@ -6,7 +6,7 @@ USE_TK=${USE_TK:-"y"}
pkgname=ruby
pkgver=2.3.0
pkgpatch=
-pkgrel=1
+pkgrel=2
pkgdesc="An object-oriented programming language."
url="http://www.ruby-lang.org/"
depends=('libxml2>=2.9.3-2' 'zlib>=1.2.8-3' 'db>=6.1.26' 'readline>=6.3-7' \
@@ -14,8 +14,9 @@ depends=('libxml2>=2.9.3-2' 'zlib>=1.2.8-3' 'db>=6.1.26' 'readline>=6.3-7' \
groups=('devel')
archs=('i686' 'x86_64' 'arm')
up2date="Flasttar ftp://ftp.ruby-lang.org/pub/ruby/"
-source=(ftp://ftp.ruby-lang.org/pub/ruby/ruby-${pkgver}$pkgpatch.tar.xz)
-sha1sums=('96e620e38af351c8da63e40cfe217ec79f912ba1')
+source=(ftp://ftp.ruby-lang.org/pub/ruby/ruby-${pkgver}$pkgpatch.tar.xz have-builtins.patch)
+sha1sums=('96e620e38af351c8da63e40cfe217ec79f912ba1' \
+          '70620bc70dd25f545ea44d9d2e8f623656243faf')
replaces=('rake' 'racc' 'rdoc')
provides=("${replaces[@]}")
conflicts=("${replaces[@]}")
diff --git a/source/devel/ruby/have-builtins.patch b/source/devel/ruby/have-builtins.patch
new file mode 100644
index 0000000..da7e980
--- /dev/null
+++ b/source/devel/ruby/have-builtins.patch
@@ -0,0 +1,31 @@
+From 98e565ec78cb4a07ffde8589ac4581fca31e9c17 Mon Sep 17 00:00:00 2001
+From: mrkn <mrkn at b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+Date: Thu, 7 Jan 2016 13:35:32 +0000
+Subject: [PATCH] * ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
+   and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++.   [ruby-core:72736]
+ [Bug #11962]
+
+git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
+---
+ ChangeLog           | 6 ++++++
+ include/ruby/ruby.h | 7 +++++++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
+index 7aabf5b..82dca14 100644
+--- a/include/ruby/ruby.h
++++ b/include/ruby/ruby.h
+@@ -26,6 +26,13 @@ extern "C" {
+ #include RUBY_EXTCONF_H
+ #endif
+
++#if defined(__cplusplus)
++/* __builtin_choose_expr and __builtin_types_compatible aren't available
++ * on C++.  See https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html */
++# undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
++# undef HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P
++#endif
++
+ #include "defines.h"
+
+ #define NORETURN_STYLE_NEW 1


More information about the Frugalware-git mailing list