summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonin Kral <a.kral@bobek.cz>2011-09-14 17:27:45 +0200
committerAntonin Kral <a.kral@bobek.cz>2011-09-14 17:28:08 +0200
commitec695a6d3e90ba6acf8bc3448b6851ec474b1193 (patch)
tree02760901eb06d61e171ad69f1d528787007d623f
parent13b96efbd11f173cb46366ac8071e065e0a48520 (diff)
downloadmongodb-ec695a6d3e90ba6acf8bc3448b6851ec474b1193.tar.gz
regenerated patches
-rw-r--r--debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch4
-rw-r--r--debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch4
-rw-r--r--debian/patches/0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch23
-rw-r--r--debian/patches/series1
4 files changed, 28 insertions, 4 deletions
diff --git a/debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch b/debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
index 3e140a5..5fed695 100644
--- a/debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
+++ b/debian/patches/0001-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch
@@ -7,10 +7,10 @@ Subject: install libs to /usr/lib not /usr/lib64 (Closes: #588557)
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/SConstruct b/SConstruct
-index 41383b1..cb6019f 100644
+index 4e46052..f98eb27 100644
--- a/SConstruct
+++ b/SConstruct
-@@ -469,7 +469,7 @@ elif "linux2" == os.sys.platform:
+@@ -495,7 +495,7 @@ elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
if os.uname()[4] == "x86_64" and not force32:
linux64 = True
diff --git a/debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch b/debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch
index b8cd144..be0629b 100644
--- a/debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch
+++ b/debian/patches/0002-return-empty-TERM-if-not-set-Closes-620910.patch
@@ -7,10 +7,10 @@ Subject: return empty TERM if not set (Closes: #620910)
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/SConstruct b/SConstruct
-index cb6019f..0293366 100644
+index f98eb27..7417daa 100644
--- a/SConstruct
+++ b/SConstruct
-@@ -679,7 +679,7 @@ if nix:
+@@ -684,7 +684,7 @@ if nix:
#make scons colorgcc friendly
env['ENV']['HOME'] = os.environ['HOME']
diff --git a/debian/patches/0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch b/debian/patches/0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch
new file mode 100644
index 0000000..f597cbb
--- /dev/null
+++ b/debian/patches/0003-Ignore-unused-but-set-variables-and-params-Closes-62.patch
@@ -0,0 +1,23 @@
+From: Antonin Kral <a.kral@bobek.cz>
+Date: Wed, 14 Sep 2011 17:26:58 +0200
+Subject: Ignore unused but set variables and params (Closes: #625401)
+
+---
+ SConstruct | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 7417daa..05d0dfe 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -674,7 +674,8 @@ if nix:
+ # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
+ if linux:
+ env.Append( CPPFLAGS=" -Werror " )
+- if not has_option('clang'):
++ env.Append( CPPFLAGS=" -Wno-error=unused-but-set-variable -Wno-error=unused-but-set-parameter " ) # ignore new gcc 4.6 warnings
++ if not has_option('clang'):
+ env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
+
+ env.Append( CPPDEFINES="_FILE_OFFSET_BITS=64" )
+--
diff --git a/debian/patches/series b/debian/patches/series
index 9e0d57f..4acc1e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +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