- fixed libraries ordering for linking

Changed files:
    mongodb-build.patch -> 1.2
    mongodb.spec -> 1.19

diff --git a/mongodb-build.patch b/mongodb-build.patch
index 0346fa24034042a1cd58a37d3ff1353bf269ec34..48db3bd46ee15296c9bec2a23e2aab0ee165f4d7 100644 (file)
--- a/mongodb-build.patch
+++ b/mongodb-build.patch
@@ -18,3 +18,12 @@
  
  mmapFiles = [ "util/mmap.cpp" ]
  
+@@ -1131,7 +1131,7 @@
+         sniffEnv.Append( LIBS=[ "wpcap" ] )
+ 
+     sniffEnv.Prepend( LIBPATH=["."] )
+-    sniffEnv.Append( LIBS=[ "mongotestfiles" ] )
++    sniffEnv.Prepend( LIBS=[ "mongotestfiles" ] )
+ 
+     sniffEnv.Program( "mongosniff" , "tools/sniffer.cpp" )
+ 

diff --git a/mongodb.spec b/mongodb.spec
index 002d065bbe29282488bc387e1259cf70246c0ff0..bd8e930d8796de73e2c1683ce129742d3614159c 100644 (file)
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -140,7 +140,6 @@ find -type f -executable | xargs chmod a-x
 %{__rm} -r third_party/{js-1.7,pcre-7.4,snappy,*.py}
 
 %build
-export LDFLAGS="%{rpmldflags} =-fuse-ld=bfd"
 %scons \
        --prefix=$RPM_BUILD_ROOT%{_prefix} \
        --sharedclient \
@@ -155,7 +154,6 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/man1} \
        $RPM_BUILD_ROOT%{_var}/{lib,log}/mongo
 
 # XXX: scons is so great, recompiles everything here!
-export LDFLAGS="%{rpmldflags} =-fuse-ld=bfd"
 %scons install \
        --prefix=$RPM_BUILD_ROOT%{_prefix} \
        --sharedclient \