[packages/ruby-ffi-yajl] - fixed system-yajl patch - rel 3
baggins
baggins at pld-linux.org
Sun Jul 15 10:18:09 CEST 2018
commit c57751f7d189f64df3921795314add8e7faf7060
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jul 15 10:17:49 2018 +0200
- fixed system-yajl patch
- rel 3
ruby-ffi-yajl.spec | 2 +-
system-yajl.patch | 32 ++++++++++++++++----------------
2 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/ruby-ffi-yajl.spec b/ruby-ffi-yajl.spec
index 5b04117..3d54450 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: 2
+Release: 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 b9fcd39..27ab0ce 100644
--- a/system-yajl.patch
+++ b/system-yajl.patch
@@ -4,11 +4,11 @@
# 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 "rubygems"
-
--require 'libyajl2'
+-require "libyajl2"
begin
- require 'ffi'
+ 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
@@ -16,19 +16,19 @@
# 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 "rubygems"
-
- require 'ffi_yajl/encoder'
- require 'ffi_yajl/parser'
- require 'ffi_yajl/ext/dlopen'
+ 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 @@
- require 'mkmf'
- require 'rubygems'
--require 'libyajl2'
+ require "mkmf"
+ require "rubygems"
+-require "libyajl2"
- RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+ RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
-# pick up the vendored libyajl2 out of the libyajl2 gem
-$CFLAGS = " -I#{Libyajl2.include_path} #{$CFLAGS}"
@@ -40,11 +40,11 @@
--- 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 @@
- require 'mkmf'
- require 'rubygems'
--require 'libyajl2'
+ require "mkmf"
+ require "rubygems"
+-require "libyajl2"
- RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+ RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
-# pick up the vendored libyajl2 out of the libyajl2 gem
-$CFLAGS = "-I#{Libyajl2.include_path} #{$CFLAGS}"
@@ -59,7 +59,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 'libyajl2'
+-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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-ffi-yajl.git/commitdiff/c57751f7d189f64df3921795314add8e7faf7060
More information about the pld-cvs-commit
mailing list