Mail archive
alpine-aports

[alpine-aports] [PATCH] main/ruby: disable dlsym version check on mips*

From: alpine-mips-patches <info_at_mobile-stream.com>
Date: Sun, 16 Sep 2018 01:22:24 +0300 (MSK)

---
 main/ruby/APKBUILD                              |  4 +++-
 main/ruby/mips-disable-ruby_xmalloc-check.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 main/ruby/mips-disable-ruby_xmalloc-check.patch
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index d0b0520e87..19f8e8bcc5 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
_at_@ -62,6 +62,7 @@ source="ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
 	test_insns-lower-recursion-depth.patch
 	fix-get_main_stack.patch
 	libressl-2.7.patch
+	mips-disable-ruby_xmalloc-check.patch
 	"
 replaces="ruby-gems"
 builddir="$srcdir/$pkgname-$pkgver"
_at_@ -336,4 +337,5 @@ sha512sums="82e799ecf7257a9f5fe8691c50a478b0f91bd4bdca50341c839634b0da5cd76c5556
 cfdc5ea3b2e2ea69c51f38e8e2180cb1dc27008ca55cc6301f142ebafdbab31c3379b3b6bba9ff543153876dd98ed2ad194df3255b7ea77a62e931c935f80538  rubygems-avoid-platform-specific-gems.patch
 814fe6359505b70d8ff680adf22f20a74b4dbd3fecc9a63a6c2456ee9824257815929917b6df5394ed069a6869511b8c6dce5b95b4acbbb7867c1f3a975a0150  test_insns-lower-recursion-depth.patch
 8d730f02f76e53799f1c220eb23e3d2305940bb31216a7ab1e42d3256149c0721c7d173cdbfe505023b1af2f5cb3faa233dcc1b5d560fa8f980c17c2d29a9d81  fix-get_main_stack.patch
-fc789c840af7812ce1796470e77f71cb321e1d74b2bce97a11b5b63db7f6f0fd23576acfa193e425a51e52c0aef1ab9157e4e8a54eef7d59e02541e844055b28  libressl-2.7.patch"
+fc789c840af7812ce1796470e77f71cb321e1d74b2bce97a11b5b63db7f6f0fd23576acfa193e425a51e52c0aef1ab9157e4e8a54eef7d59e02541e844055b28  libressl-2.7.patch
+dedfa8dae9b87e9f044265a7a5f87f652f42686b89b12c59b635526c3daa995329770e2df45c97f5f076d722cd76d492208cc61f5be4369b444cf099dc628bc5  mips-disable-ruby_xmalloc-check.patch"
diff --git a/main/ruby/mips-disable-ruby_xmalloc-check.patch b/main/ruby/mips-disable-ruby_xmalloc-check.patch
new file mode 100644
index 0000000000..996d40b1fb
--- /dev/null
+++ b/main/ruby/mips-disable-ruby_xmalloc-check.patch
_at_@ -0,0 +1,11 @@
+--- a/dln.c
++++ b/dln.c
+_at_@ -1327,7 +1327,7 @@
+ 	    error = dln_strerror();
+ 	    goto failed;
+ 	}
+-# if defined RUBY_EXPORT
++# if defined RUBY_EXPORT && !defined(__mips)
+ 	{
+ 	    void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc");
+ 	    if (ex && ex != ruby_xmalloc) {
-- 
2.19.0
---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Sun Sep 16 2018 - 01:22:24 GMT