summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonin Kral <a.kral@bobek.cz>2011-12-15 11:15:11 +0100
committerAntonin Kral <a.kral@bobek.cz>2011-12-15 11:15:11 +0100
commit5aaf47415d2e84ef9c2b41a2e84bb17c1c9854d1 (patch)
tree2854b92eaa1f38c8111b8a14a088cc897c50bd53
parent0b48f8ada2acb0de830b23f8cefc8e3fea28d915 (diff)
downloadmongodb-5aaf47415d2e84ef9c2b41a2e84bb17c1c9854d1.tar.gz
remove failing patch
-rw-r--r--debian/patches/0004-use-system-wide-pcre.patch37
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 38 deletions
diff --git a/debian/patches/0004-use-system-wide-pcre.patch b/debian/patches/0004-use-system-wide-pcre.patch
deleted file mode 100644
index 82851e0..0000000
--- a/debian/patches/0004-use-system-wide-pcre.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 a018508..4acc1e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
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