diff options
author | Antonin Kral <a.kral@bobek.cz> | 2011-04-05 10:18:15 +0200 |
---|---|---|
committer | Antonin Kral <a.kral@bobek.cz> | 2011-04-05 10:18:15 +0200 |
commit | dc90fb9c5284fc9db8315937dacdc44e2ca4f184 (patch) | |
tree | 7f24120252b3e24f3a4c9c989a87c474896971f0 | |
parent | 90f719a6ef3519229c644fde9700c5c29ee0c94b (diff) | |
download | mongodb-dc90fb9c5284fc9db8315937dacdc44e2ca4f184.tar.gz |
sync SConstruct to provide new set of patches
-rw-r--r-- | SConstruct | 2 | ||||
-rw-r--r-- | debian/patches/2001_x64_install_to_lib.patch | 16 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 18 deletions
@@ -469,7 +469,7 @@ elif "linux2" == os.sys.platform: if os.uname()[4] == "x86_64" and not force32: linux64 = True - nixLibPrefix = "lib" + nixLibPrefix = "lib64" env.Append( LIBPATH=["/usr/lib64" , "/lib64" ] ) env.Append( LIBS=["pthread"] ) diff --git a/debian/patches/2001_x64_install_to_lib.patch b/debian/patches/2001_x64_install_to_lib.patch deleted file mode 100644 index 61954b6..0000000 --- a/debian/patches/2001_x64_install_to_lib.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Install libs to /usr/lib, not /usr/lib64 - Closes: #588557 -Forwarded: not-needed -Author: Antonin Kral <A.Kral@sh.cvut.cz> -Last-Update: 2010-08-11 ---- a/SConstruct -+++ b/SConstruct -@@ -553,7 +553,7 @@ - - if os.uname()[4] == "x86_64" and not force32: - linux64 = True -- nixLibPrefix = "lib64" -+ nixLibPrefix = "lib" - env.Append( LIBPATH=["/usr/lib64" , "/lib64" ] ) - env.Append( LIBS=["pthread"] ) - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 49554c2..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -2001_x64_install_to_lib.patch |