summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2012-06-15 00:13:30 +0000
committerIgor Pashev <pashev.igor@gmail.com>2012-06-15 00:13:30 +0000
commite4ebbd5ba1bfd44abb366adcb3bf28479e467750 (patch)
tree1ec829e391b1f0a0a8c25eaf5e659ead773e6629
parentd83c5190a2e3cd43ffa382ce5c687c1597efaa1d (diff)
downloadmongodb-e4ebbd5ba1bfd44abb366adcb3bf28479e467750.tar.gz
Link with libpcre on SunOS
-rw-r--r--debian/patches/0004-link-with-pcrecpp-and-pcre-if-sunos.patch22
-rw-r--r--debian/patches/series1
2 files changed, 23 insertions, 0 deletions
diff --git a/debian/patches/0004-link-with-pcrecpp-and-pcre-if-sunos.patch b/debian/patches/0004-link-with-pcrecpp-and-pcre-if-sunos.patch
new file mode 100644
index 0000000..bf21826
--- /dev/null
+++ b/debian/patches/0004-link-with-pcrecpp-and-pcre-if-sunos.patch
@@ -0,0 +1,22 @@
+From: Igor Pashev <pashev.igor@gmail.com>
+Date: Thu, 14 Jun 2012 23:23:08 +0000
+Subject: link with pcrecpp and pcre if sunos
+
+---
+ SConstruct | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/SConstruct b/SConstruct
+index 418cb4c..3ff81f8 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -552,6 +552,9 @@ elif "sunos5" == os.sys.platform:
+ solaris = True
+ env.Append( CPPDEFINES=[ "__sunos__" ] )
+ env.Append( LIBS=["socket","resolv"] )
++ # use system-wide pcre
++ env.Append( CPPPATH=["/usr/include"] )
++ env.Append( LIBS=["pcrecpp", "pcre"] )
+
+ elif os.sys.platform.startswith( "freebsd" ):
+ nix = True
diff --git a/debian/patches/series b/debian/patches/series
index f818da6..8ce975f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
0002-Ignore-unused-but-set-variables-and-params-Closes-62.patch
0003-use-system-wide-pcre.patch
+0004-link-with-pcrecpp-and-pcre-if-sunos.patch