[packages/ruby-ffi-yajl] skip ruby-libyajl2 hack also during build
glen
glen at pld-linux.org
Wed Nov 12 22:22:11 CET 2014
commit c06241f1079adf6db3d2861a5147fc48325bca59
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Nov 12 23:22:01 2014 +0200
skip ruby-libyajl2 hack also during build
system-yajl.patch | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
---
diff --git a/system-yajl.patch b/system-yajl.patch
index ef923aa..4669d03 100644
--- a/system-yajl.patch
+++ b/system-yajl.patch
@@ -25,3 +25,35 @@
class YajlCallbacks < ::FFI::Struct
layout :yajl_null, :pointer,
+--- 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'
+
+ 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}"
+-$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 @@
+ 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
+-$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")
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-ffi-yajl.git/commitdiff/c06241f1079adf6db3d2861a5147fc48325bca59
More information about the pld-cvs-commit
mailing list