From dce880b4259ccb91e1c03ee4fead109533feb7b9 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 2 Feb 2018 00:29:39 +0100
Subject: [PATCH] ruby: disable stack protector

---
 srcpkgs/ruby/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index b1f495e2a24..02a877c21e7 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=2.5.0
 
 pkgname=ruby
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
@@ -41,10 +41,9 @@ pre_build() {
 	# Hack for cross-builds.
 	touch ext/ripper/check
 	if [ "$XBPS_GCC_VERSION_MAJOR" -ge 7 ]; then
-		# Set -fno-stack-protector for i686* or otherwise linking fails with
-		# ...: undefined reference to '__stack_chk_fail_local'
+		# Disable stack protector: it causes unexpected behaviours with native libraries (subtle, vagrant)
 		case "$XBPS_TARGET_MACHINE" in
-			i686*) sed -i Makefile \
+			*) sed -i Makefile \
 					-e "s;-fstack-protector-strong;;" \
 					-e "s;-fstack-protector;-fno-stack-protector;"
 				;;