Page MenuHomePhabricator (Chris)
Files F133897

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/debian/patches/0001-Try-linking-with-public-libmongoc-1.0-library-and-sl.patch b/debian/patches/0001-Try-linking-with-public-libmongoc-1.0-library-and-sl.patch
new file mode 100644
index 00000000..e2253f3a
--- /dev/null
+++ b/debian/patches/0001-Try-linking-with-public-libmongoc-1.0-library-and-sl.patch
@@ -0,0 +1,38 @@
+From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@sury.org>
+Date: Mon, 18 Jan 2016 11:52:58 +0100
+Subject: Try linking with public libmongoc-1.0 library and slowly resolve the
+ internal dependencies
+
+---
+ mongodb-1.1.2/config.m4 | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/mongodb-1.1.2/config.m4 b/mongodb-1.1.2/config.m4
+index 4d03388..f28e95b 100644
+--- a/mongodb-1.1.2/config.m4
++++ b/mongodb-1.1.2/config.m4
+@@ -68,8 +68,6 @@ AC_DEFUN([PHP_BSON_CLOCK],
+ fi
+ ])
+
+-MONGOC_SYMBOL_SUFFIX="priv"
+-
+ AC_MSG_CHECKING(PHP version)
+ PHP_FOUND_VERSION=`${PHP_CONFIG} --version`
+ PHP_FOUND_VERNUM=`echo "${PHP_FOUND_VERSION}" | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 100 + [$]2) * 100 + [$]3;}'`
+@@ -339,11 +337,11 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
+ if test "$PHP_LIBMONGOC" != "no"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ AC_MSG_CHECKING(for libmongoc)
+- if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongoc-1.0 && $PKG_CONFIG --exists libmongoc-priv; then
++ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongoc-1.0; then
+ if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.3.0; then
+- LIBMONGOC_INC=`$PKG_CONFIG libmongoc-priv --cflags`
+- LIBMONGOC_LIB=`$PKG_CONFIG libmongoc-priv --libs`
+- LIBMONGOC_VER=`$PKG_CONFIG libmongoc-priv --modversion`
++ LIBMONGOC_INC=`$PKG_CONFIG libmongoc-1.0 --cflags`
++ LIBMONGOC_LIB=`$PKG_CONFIG libmongoc-1.0 --libs`
++ LIBMONGOC_VER=`$PKG_CONFIG libmongoc-1.0 --modversion`
+ AC_MSG_RESULT(version $LIBMONGOC_VER found)
+ CFLAGS="$CFLAGS -DMONGOC_I_AM_A_DRIVER"
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29b..30bce7cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Try-linking-with-public-libmongoc-1.0-library-and-sl.patch

File Metadata

Mime Type
text/x-diff
Expires
Wed, Jun 17, 9:09 PM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
70987
Default Alt Text
(2 KB)

Event Timeline