[Pkg-mongodb-maintainers] [pkg-mongodb] 338/394: Use system yaml

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository pkg-mongodb.

commit 3906bfefb540d57050f667c3ecd91ac4b9b9472f
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Thu Jan 14 14:26:16 2016 +0200

    Use system yaml
    
    Include patch by Ubuntu to fix yaml-cpp detection, B-D on
    libyaml-cpp-dev and pass --with-system-yaml to scons.
---
 debian/control                          |  1 +
 debian/patches/fix-yaml-detection.patch | 18 ++++++++++++++++++
 debian/patches/series                   |  1 +
 debian/rules                            |  3 ++-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 6d9d0f5..d90e869 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends:
  libboost-program-options-dev,
  libboost-thread-dev,
  libgoogle-perftools-dev [linux-amd64 linux-i386 armhf],
+ libyaml-cpp-dev,
  libpcap-dev,
  libpcre3-dev,
  libreadline-dev,
diff --git a/debian/patches/fix-yaml-detection.patch b/debian/patches/fix-yaml-detection.patch
new file mode 100644
index 0000000..b5e0a34
--- /dev/null
+++ b/debian/patches/fix-yaml-detection.patch
@@ -0,0 +1,18 @@
+Description: Fixup detection of yaml-cpp library
+ The --use-system-yaml flag incorrectly searches for 'yaml' not 'yaml-cpp'.
+ Update the search to look for the correct library name.
+Author: James Page <james.page at ubuntu.com>
+Forwarded: https://github.com/mongodb/mongo/pull/707
+Bug: https://jira.mongodb.org/browse/SERVER-14388
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -1359,7 +1359,7 @@ def doConfigure(myenv):
+         conf.FindSysLibDep("stemmer", ["stemmer"])
+ 
+     if use_system_version_of_library("yaml"):
+-        conf.FindSysLibDep("yaml", ["yaml"])
++        conf.FindSysLibDep("yaml", ["yaml-cpp"])
+ 
+     if use_system_version_of_library("boost"):
+         if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
diff --git a/debian/patches/series b/debian/patches/series
index 67fc5bc..f3f5047 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 no-unused-function.patch
 disable-warnings.patch
 0014-Fix-GCC-5-FTBFS.patch
+fix-yaml-detection.patch
diff --git a/debian/rules b/debian/rules
index a2998b9..2e500c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,8 @@ endif
 HARDENING_OPTIONS = CC="$(CC)" CFLAGS="$(CFLAGS)" \
   CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)"
 COMMON_OPTIONS = --use-system-snappy --use-system-tcmalloc --use-system-pcre \
-  --use-system-boost --use-system-v8 --ssl $(DEB_SCONS_OPTIONS)
+  --use-system-boost --use-system-v8 --use-system-yaml --ssl \
+  $(DEB_SCONS_OPTIONS)
 
 DEB_SCONS_CLEAN = --directory="." $(HARDENING_OPTIONS) . --keep-going --clean \
   $(COMMON_OPTIONS)

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