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

This reverts commit dce880b4259ccb91e1c03ee4fead109533feb7b9.
---
 srcpkgs/ruby/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 02a877c21e7..62fd54f54fd 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=2
+revision=3
 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,9 +41,10 @@ pre_build() {
 	# Hack for cross-builds.
 	touch ext/ripper/check
 	if [ "$XBPS_GCC_VERSION_MAJOR" -ge 7 ]; then
-		# Disable stack protector: it causes unexpected behaviours with native libraries (subtle, vagrant)
+		# Set -fno-stack-protector for i686* or otherwise linking fails with
+		# ...: undefined reference to '__stack_chk_fail_local'
 		case "$XBPS_TARGET_MACHINE" in
-			*) sed -i Makefile \
+			i686*) sed -i Makefile \
 					-e "s;-fstack-protector-strong;;" \
 					-e "s;-fstack-protector;-fno-stack-protector;"
 				;;