tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "ruby: disable stack protector"

Browse Source 
This reverts commit dce880b4259ccb91e1c03ee4fead109533feb7b9.
This commit is contained in:
Andrea Brancaleoni 2018-02-02 00:53:21 +01:00
parent 3403e1d607
commit efad3dd2b6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
srcpkgs/ruby/template
View File

@ -3,7 +3,7 @@ _ruby_abiver=2.5.0
pkgname=ruby pkgname=ruby
version=2.5.0 version=2.5.0
revision=2 revision=3
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-shared --disable-rpath configure_args="--enable-shared --disable-rpath
DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config" DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
@ -41,9 +41,10 @@ pre_build() {
# Hack for cross-builds. # Hack for cross-builds.
touch ext/ripper/check touch ext/ripper/check
if [ "$XBPS_GCC_VERSION_MAJOR" -ge 7 ]; then 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 case "$XBPS_TARGET_MACHINE" in
*) sed -i Makefile \ i686*) sed -i Makefile \
-e "s;-fstack-protector-strong;;" \ -e "s;-fstack-protector-strong;;" \
-e "s;-fstack-protector;-fno-stack-protector;" -e "s;-fstack-protector;-fno-stack-protector;"
;; ;;