diff options
| author | Antonin Kral <a.kral@bobek.cz> | 2011-09-15 08:25:40 +0200 |
|---|---|---|
| committer | Antonin Kral <a.kral@bobek.cz> | 2011-09-15 09:41:42 +0200 |
| commit | a123c0402c4c86ac4661a83478127ac326895081 (patch) | |
| tree | 5c23a3709ec898326b010d7916986e0b77aa3f7d | |
| parent | be2f04b0d65372f48a5c3aa2260138385cbcbd7f (diff) | |
| download | mongodb-a123c0402c4c86ac4661a83478127ac326895081.tar.gz | |
use system-wide pcre not from third_party dir
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/0004-use-system-wide-pcre.patch | 37 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 39 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 3c1ebb7..aa65388 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mongodb (1:2.0.0-1) unstable; urgency=low * New upstream release 2.0.0 (Closes: #641646) http://blog.mongodb.org/post/10126837729/mongodb-2-0-released * proper Spider Monkey is embedded (Closes: #637370, #572870, #631054) + * currently linking against system libpcre3 -- Antonin Kral <A.Kral@sh.cvut.cz> Wed, 14 Sep 2011 17:09:16 +0200 diff --git a/debian/patches/0004-use-system-wide-pcre.patch b/debian/patches/0004-use-system-wide-pcre.patch new file mode 100644 index 0000000..82851e0 --- /dev/null +++ b/debian/patches/0004-use-system-wide-pcre.patch @@ -0,0 +1,37 @@ +From: Antonin Kral <a.kral@bobek.cz> +Date: Thu, 15 Sep 2011 09:41:07 +0200 +Subject: use system-wide pcre + +--- + SConstruct | 10 +++++++++- + 1 files changed, 9 insertions(+), 1 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 05d0dfe..ababc34 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -493,6 +493,10 @@ elif "linux2" == os.sys.platform or "linux3" == os.sys.platform: + linux = True + platform = "linux" + ++ # use system-wide pcre ++ env.Append( CPPPATH=["/usr/include"] ) ++ env.Append( LIBS=["pcrecpp", "pcre"] ) ++ + if os.uname()[4] == "x86_64" and not force32: + linux64 = True + nixLibPrefix = "lib" +@@ -761,7 +765,11 @@ if not windows: + for x in os.listdir( "third_party" ): + if not x.endswith( ".py" ) or x.find( "#" ) >= 0: + continue +- ++ ++ # use system-wide pcre ++ if x.find('pcre') >= 0: ++ continue ++ + shortName = x.rpartition( "." )[0] + path = "third_party/%s" % x + +-- diff --git a/debian/patches/series b/debian/patches/series index 4acc1e0..a018508 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-return-empty-TERM-if-not-set-Closes-620910.patch 0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch +0004-use-system-wide-pcre.patch |