[DRE-commits] [ruby-passenger] 06/07: Really get rid of embedded jsoncpp.

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository ruby-passenger.

commit 432157b081c0ce1110a946091205100842eff987
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Aug 24 13:48:12 2014 +0200

    Really get rid of embedded jsoncpp.
---
 debian/patches/system_jsoncpp.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/debian/patches/system_jsoncpp.patch b/debian/patches/system_jsoncpp.patch
index c08fbe2..c72ff62 100644
--- a/debian/patches/system_jsoncpp.patch
+++ b/debian/patches/system_jsoncpp.patch
@@ -4,6 +4,14 @@ Last-Update: 2014-08-24
 
 --- a/build/agents.rb
 +++ b/build/agents.rb
+@@ -105,6 +105,7 @@ file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
+ 		"#{EXTRA_PRE_CXX_LDFLAGS} " <<
+ 		"#{LIBEV_LIBS} " <<
+ 		"#{LIBEIO_LIBS} " <<
++		"-ljsoncpp " <<  
+ 		"#{PlatformInfo.portability_cxx_ldflags} " <<
+ 		"#{AGENT_LDFLAGS} " <<
+ 		"#{EXTRA_CXX_LDFLAGS}")
 @@ -111,7 +111,7 @@ file AGENT_OUTPUT_DIR + 'PassengerHelperAgent' => dependencies do
  end
  
@@ -62,6 +70,20 @@ Last-Update: 2014-08-24
  		cflags = (flags + EXTRA_CFLAGS).strip
  		cxxflags = (flags + EXTRA_CXXFLAGS).strip
  
+@@ -439,13 +439,6 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
+ 			Utils/fib.h
+ 			Utils/fibpriv.h
+ 		)
+-	define_component 'Utils/jsoncpp.o',
+-		:source   => 'Utils/jsoncpp.cpp',
+-		:category => :other,
+-		:deps     => %w(
+-			Utils/json.h
+-			Utils/json-forwards.h
+-		)
+ 
+ 	#'BCrypt.o' => %w(
+ 	#	BCrypt.cpp
 --- a/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp
 +++ b/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp
 @@ -1,6 +1,6 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-passenger.git