[packages/ruby-ffi-yajl] Rel 7
arekm
arekm at pld-linux.org
Sat Mar 21 00:43:17 CET 2026
commit db2597b30d50739794e3136cd5bb62f8eb4a08b0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Mar 21 00:43:07 2026 +0100
Rel 7
ruby-ffi-yajl.spec | 2 +-
system-yajl.patch | 94 ++++++++++++++++++++++++++++++------------------------
2 files changed, 53 insertions(+), 43 deletions(-)
---
diff --git a/ruby-ffi-yajl.spec b/ruby-ffi-yajl.spec
index 9c06362..444b479 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.3.1
-Release: 6
+Release: 7
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 27ab0ce..a24f143 100644
--- a/system-yajl.patch
+++ b/system-yajl.patch
@@ -1,70 +1,73 @@
---- ffi-yajl-2.2.3/lib/ffi_yajl/ffi.rb~ 2016-06-02 18:51:31.000000000 +0300
-+++ ffi-yajl-2.2.3/lib/ffi_yajl/ffi.rb 2016-06-02 18:52:21.951416437 +0300
-@@ -20,9 +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.
-
--require "rubygems"
--
--require "libyajl2"
- begin
- require "ffi"
- rescue LoadError
---- ffi-yajl-2.2.3/lib/ffi_yajl/ext.rb~ 2016-06-02 18:54:08.000000000 +0300
-+++ ffi-yajl-2.2.3/lib/ffi_yajl/ext.rb 2016-06-02 18:54:34.768251524 +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.
-
--require "rubygems"
--
- require "ffi_yajl/encoder"
- require "ffi_yajl/parser"
- require "ffi_yajl/ext/dlopen"
---- ffi-yajl-1.2.0/ext/ffi_yajl/ext/encoder/extconf.rb~ 2014-11-12 23:19:03.000000000 +0200
-+++ ffi-yajl-1.2.0/ext/ffi_yajl/ext/encoder/extconf.rb 2014-11-12 23:20:13.882893756 +0200
-@@ -1,13 +1,8 @@
+diff -ur ffi-yajl-2.3.1.orig/ext/ffi_yajl/ext/encoder/extconf.rb ffi-yajl-2.3.1/ext/ffi_yajl/ext/encoder/extconf.rb
+--- ffi-yajl-2.3.1.orig/ext/ffi_yajl/ext/encoder/extconf.rb 2026-03-20 15:23:36.892973559 +0100
++++ ffi-yajl-2.3.1/ext/ffi_yajl/ext/encoder/extconf.rb 2026-03-20 15:24:49.994270674 +0100
+@@ -1,13 +1,10 @@
+ # rubocop:disable Style/GlobalVars
require "mkmf"
require "rubygems"
-require "libyajl2"
RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
--# pick up the vendored libyajl2 out of the libyajl2 gem
+ # pick up the vendored libyajl2 out of the libyajl2 gem
-$CFLAGS = " -I#{Libyajl2.include_path} #{$CFLAGS}"
-$LDFLAGS = " -L#{Libyajl2.opt_path} #{$LDFLAGS}"
--
+
# remove "-Wl,--no-undefined" flag if existent to allow for loading with dlopen
$LDFLAGS.slice!("-Wl,--no-undefined")
-
---- ffi-yajl-1.2.0/ext/ffi_yajl/ext/parser/extconf.rb~ 2014-11-12 23:19:03.000000000 +0200
-+++ ffi-yajl-1.2.0/ext/ffi_yajl/ext/parser/extconf.rb 2014-11-12 23:20:29.100220591 +0200
-@@ -1,13 +1,8 @@
+diff -ur ffi-yajl-2.3.1.orig/ext/ffi_yajl/ext/parser/extconf.rb ffi-yajl-2.3.1/ext/ffi_yajl/ext/parser/extconf.rb
+--- ffi-yajl-2.3.1.orig/ext/ffi_yajl/ext/parser/extconf.rb 2026-03-20 15:23:36.892664799 +0100
++++ ffi-yajl-2.3.1/ext/ffi_yajl/ext/parser/extconf.rb 2026-03-20 15:24:49.996378093 +0100
+@@ -1,13 +1,10 @@
+ # rubocop:disable Style/GlobalVars
require "mkmf"
require "rubygems"
-require "libyajl2"
RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
--# pick up the vendored libyajl2 out of the libyajl2 gem
+ # pick up the vendored libyajl2 out of the libyajl2 gem
-$CFLAGS = "-I#{Libyajl2.include_path} #{$CFLAGS}"
-$LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
--
+
# remove "-Wl,--no-undefined" flag if existent to allow for loading with dlopen
$LDFLAGS.slice!("-Wl,--no-undefined")
+diff -ur ffi-yajl-2.3.1.orig/lib/ffi_yajl/ext.rb ffi-yajl-2.3.1/lib/ffi_yajl/ext.rb
+--- ffi-yajl-2.3.1.orig/lib/ffi_yajl/ext.rb 2026-03-20 15:23:36.890821214 +0100
++++ ffi-yajl-2.3.1/lib/ffi_yajl/ext.rb 2026-03-20 15:24:49.992021692 +0100
+@@ -20,7 +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.
+
+-require "rubygems"
+
+ require "ffi_yajl/encoder"
+ require "ffi_yajl/parser"
+diff -ur ffi-yajl-2.3.1.orig/lib/ffi_yajl/ffi.rb ffi-yajl-2.3.1/lib/ffi_yajl/ffi.rb
+--- ffi-yajl-2.3.1.orig/lib/ffi_yajl/ffi.rb 2026-03-20 15:23:36.890821214 +0100
++++ ffi-yajl-2.3.1/lib/ffi_yajl/ffi.rb 2026-03-20 15:24:49.989755059 +0100
+@@ -20,9 +20,7 @@
+ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-require "rubygems"
---- 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 @@
+-require "libyajl2"
+ begin
+ require "ffi"
+ rescue LoadError
+diff -ur ffi-yajl-2.3.1.orig/lib/ffi_yajl/map_library_name.rb ffi-yajl-2.3.1/lib/ffi_yajl/map_library_name.rb
+--- ffi-yajl-2.3.1.orig/lib/ffi_yajl/map_library_name.rb 2026-03-20 15:23:36.891121200 +0100
++++ ffi-yajl-2.3.1/lib/ffi_yajl/map_library_name.rb 2026-03-20 15:24:44.409825582 +0100
+@@ -20,7 +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.
-require "libyajl2"
--
+
# Mixin for use in finding the right yajl library on the system. The 'caller'
# needs to also mixin either the FFI module or the DLopen module. Those are
- # deliberately not mixed in to avoid loading the dlopen module in the ffi
-@@ -45,16 +43,7 @@
+@@ -45,16 +44,7 @@
# @api private
# @return Array<String> Array of yajl library names for platform
def library_names
@@ -82,8 +85,15 @@
end
# Array of yajl library names prepended with the libyajl2 path to use to
-@@ -78,7 +67,7 @@
- # @api private
+@@ -71,14 +61,9 @@
+ end.compact
+ end
+
+- # Iterate across the expanded library names in the libyajl2-gem and then
+- # attempt to load the system libraries. Uses the native dlopen extension
+- # that ships in this gem.
+- #
+- # @api private
def dlopen_yajl_library
found = false
- ( expanded_library_names + library_names ).each do |libname|
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-ffi-yajl.git/commitdiff/db2597b30d50739794e3136cd5bb62f8eb4a08b0
More information about the pld-cvs-commit
mailing list