[packages/ruby-ffi-yajl] fix library loading

glen glen at pld-linux.org
Thu Jun 2 18:13:26 CEST 2016


commit 1db908a0eff5a446ab10724433144c1aec7c7c29
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jun 2 19:08:44 2016 +0300

    fix library loading
    
    we want lib only from system path

 ruby-ffi-yajl.spec |  2 +-
 system-yajl.patch  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/ruby-ffi-yajl.spec b/ruby-ffi-yajl.spec
index eeafc7d..2d36af7 100644
--- a/ruby-ffi-yajl.spec
+++ b/ruby-ffi-yajl.spec
@@ -9,7 +9,7 @@
 Summary:	Ruby FFI wrapper around YAJL 2.x
 Name:		ruby-%{pkgname}
 Version:	2.2.3
-Release:	0.2
+Release:	0.3
 License:	Apache v2.0
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
diff --git a/system-yajl.patch b/system-yajl.patch
index 68d2e3d..b9fcd39 100644
--- a/system-yajl.patch
+++ b/system-yajl.patch
@@ -53,8 +53,8 @@
  # remove "-Wl,--no-undefined" flag if existent to allow for loading with dlopen
  $LDFLAGS.slice!("-Wl,--no-undefined")
  
---- ffi-yajl-2.2.3/lib/ffi_yajl/map_library_name.rb~	2016-06-02 18:51:31.000000000 +0300
-+++ ffi-yajl-2.2.3/lib/ffi_yajl/map_library_name.rb	2016-06-02 18:53:35.695211477 +0300
+--- ffi-yajl-2.2.3/lib/ffi_yajl/map_library_name.rb	2016-06-02 18:53:35.695211477 +0300
++++ ffi-yajl-2.2.3/lib/ffi_yajl/map_library_name.rb	2016-06-02 19:07:39.085294423 +0300
 @@ -20,8 +20,6 @@
  # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -82,3 +82,12 @@
      end
  
      # Array of yajl library names prepended with the libyajl2 path to use to
+@@ -78,7 +67,7 @@
+     # @api private
+     def dlopen_yajl_library
+       found = false
+-      ( expanded_library_names + library_names ).each do |libname|
++      ( library_names ).each do |libname|
+         begin
+           dlopen(libname)
+           found = true
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-ffi-yajl.git/commitdiff/1db908a0eff5a446ab10724433144c1aec7c7c29



More information about the pld-cvs-commit mailing list