Ruby: fixpkgconfig, bump, debuginfo, remove stack-protector patch (#2315)

* Ruby: fixpkgconfig, bump, debuginfo, remove stack-protector patch

* Cleanup, needs a new checksum, but i'm on limited connection right now

* Checksum
This commit is contained in:
miqlas
2018-03-15 20:53:07 +01:00
committed by GitHub
parent 12b2190782
commit a1cfa24cb0
2 changed files with 9 additions and 26 deletions

View File

@@ -384,25 +384,3 @@ index 1bbf23d..e484593 100644
--
2.2.2
From 14340bc30f4f05a7e72d0eb394e90236928407f2 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 5 Jun 2016 10:38:31 +0000
Subject: disable fstack-protector on haiku.
diff --git a/configure.in b/configure.in
index 4be7f38..87449b8 100644
--- a/configure.in
+++ b/configure.in
@@ -847,7 +847,7 @@ if test "$GCC" = yes; then
# -fstack-protector
AS_CASE(["$target_os"],
- [mingw*|nacl], [
+ [mingw*|nacl|haiku*], [
stack_protector=no
])
if test -z "${stack_protector+set}"; then
--
2.2.2

View File

@@ -9,13 +9,13 @@ programming paradigms, including functional, object oriented, and \
imperative. It also has a dynamic type system and automatic memory \
management. Therefore, it is similar in varying degrees to, Smalltalk, \
Python, Perl, Lisp, Dylan, and CLU."
HOMEPAGE="http://www.ruby-lang.org/"
HOMEPAGE="https://www.ruby-lang.org/"
COPYRIGHT="1993-2017 Yukihiro Matsumoto"
LICENSE="Ruby
BSD (3-clause)"
REVISION="1"
SOURCE_URI="http://cache.ruby-lang.org/pub/ruby/2.2/ruby-$portVersion.tar.gz"
CHECKSUM_SHA256="8f37b9d8538bf8e50ad098db2a716ea49585ad1601bbd347ef84ca0662d9268a"
SOURCE_URI="https://cache.ruby-lang.org/pub/ruby/2.2/ruby-$portVersion.tar.xz"
CHECKSUM_SHA256="313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c"
PATCHES="ruby-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -41,6 +41,7 @@ REQUIRES="
lib:libiconv$secondaryArchSuffix
lib:libncursesw$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libssp$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -70,11 +71,14 @@ BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:g++$secondaryArchSuffix
cmd:git
cmd:libtoolize
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
defineDebugInfoPackage ruby$secondaryArchSuffix \
"$libDir"/libruby.so.2.2.0
BUILD()
{
libtoolize --force --copy --install
@@ -94,6 +98,7 @@ INSTALL()
export LIBRARY_PATH=$LIBRARY_PATH:%A
make install
prepareInstalledDevelLibs libruby-static libruby
fixPkgconfig
packageEntries devel $developDir
}