From 66fa526ead950a5a6c8e861f741edd9985cb65c4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 14 Oct 2021 17:33:37 +0200 Subject: [PATCH] ruby: remove dependency on libssp __stack_chk_fail is provided by libroot --- dev-lang/ruby/patches/ruby-2.7.4.patchset | 23 ----------------------- dev-lang/ruby/ruby-2.7.4.recipe | 4 +--- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/dev-lang/ruby/patches/ruby-2.7.4.patchset b/dev-lang/ruby/patches/ruby-2.7.4.patchset index 30021b998..d2069eb9d 100644 --- a/dev-lang/ruby/patches/ruby-2.7.4.patchset +++ b/dev-lang/ruby/patches/ruby-2.7.4.patchset @@ -81,26 +81,3 @@ index f1ed36b..fc28564 100644 -- 2.26.0 - -From d85ec87013b5e80ded7ae235b6c2b23b95406989 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 8 Jun 2020 19:42:51 +1000 -Subject: Disable stack-protector - - -diff --git a/configure.ac b/configure.ac -index fc28564..624f99d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -587,7 +587,7 @@ AS_IF([test "$GCC" = yes], [ - - # -fstack-protector - AS_CASE(["$target_os"], -- [mingw*], [ -+ [mingw*|haiku*], [ - stack_protector=no - ]) - AS_IF([test -z "${stack_protector+set}"], [ --- -2.26.0 - diff --git a/dev-lang/ruby/ruby-2.7.4.recipe b/dev-lang/ruby/ruby-2.7.4.recipe index e793b764d..cd4862071 100644 --- a/dev-lang/ruby/ruby-2.7.4.recipe +++ b/dev-lang/ruby/ruby-2.7.4.recipe @@ -13,7 +13,7 @@ HOMEPAGE="https://www.ruby-lang.org/" COPYRIGHT="1993-2021 Yukihiro Matsumoto" LICENSE="Ruby BSD (3-clause)" -REVISION="2" +REVISION="3" SOURCE_URI="https://cache.ruby-lang.org/pub/ruby/2.7/ruby-$portVersion.tar.bz2" CHECKSUM_SHA256="bffa8aec9da392eda98f1c561071bb6e71d217d541c617fc6e3282d79f4e7d48" SOURCE_DIR="ruby-$portVersion" @@ -51,7 +51,6 @@ REQUIRES=" lib:libiconv$secondaryArchSuffix lib:libncursesw$secondaryArchSuffix lib:libssl$secondaryArchSuffix - lib:libssp$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -101,7 +100,6 @@ PATCH() BUILD() { export CFLAGS="-D_BSD_SOURCE" - export LDFLAGS="-lssp" autoconf