[arch-commits] Commit in rubinius/trunk (2 files)

[Jan Steffens]

    Date: Wednesday, June 3, 2015 @ 23:06:31
  Author: heftig
Revision: 134711

Add a patch for GCC 5

Added:
  rubinius/trunk/0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch
Modified:
  rubinius/trunk/PKGBUILD

----------------------------------------------------+
 0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch |   25 +++++++++++++++++++
 PKGBUILD                                           |    8 ++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

Added: 0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch
===================================================================
--- 0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch	                        (rev 0)
+++ 0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch	2015-06-03 21:06:31 UTC (rev 134711)
@@ -0,0 +1,25 @@
+From e2659914cad36f73c4944e018498af30ee71591b Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 25 May 2015 02:21:07 +0200
+Subject: [PATCH] Fix a __GNUC__ check to work with GCC 5
+
+---
+ vm/object_utils.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vm/object_utils.hpp b/vm/object_utils.hpp
+index 551b3f5..66c3203 100644
+--- a/vm/object_utils.hpp
++++ b/vm/object_utils.hpp
+@@ -13,7 +13,7 @@
+ 
+ // A stupid work around for g++ changing it's behavior on 4.3
+ 
+-#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3)
++#if __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
+   #define SPECIALIZATION_STORAGE
+ #else
+   #define SPECIALIZATION_STORAGE static inline
+-- 
+2.4.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-03 19:17:16 UTC (rev 134710)
+++ PKGBUILD	2015-06-03 21:06:31 UTC (rev 134711)
@@ -13,10 +13,12 @@
 makedepends=(llvm35 rubinius-ruby)
 options=(!emptydirs)
 source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2
-        gemrc dirs.patch)
+        gemrc dirs.patch
+        0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch)
 sha256sums=('217659849ca2c67322d24ce7167e760dc835f32a701ca6e558703914ca82d02f'
             '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614'
-            'a9922b199730c059c26781af45adc46401811ff2e6840c4aeb49da4fa41acdd9')
+            'a9922b199730c059c26781af45adc46401811ff2e6840c4aeb49da4fa41acdd9'
+            '0660c552b9bbff3537901983b6fb8d8e2af9558bb95302e970696698d0ae9a25')
 
 _common() {
   export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8"
@@ -26,6 +28,8 @@
 prepare() {
   _common
 
+  patch -Np1 -i ../0001-Fix-a-__GNUC__-check-to-work-with-GCC-5.patch
+
   patch -Np1 -i ../dirs.patch
 
   mkdir -p "$GEM_HOME"