packages: mongodb/mongodb-build.patch, mongodb/mongodb.spec - fixed librari...

[baggins]

Author: baggins                      Date: Thu Dec  1 10:28:09 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed libraries ordering for linking 

---- Files affected:
packages/mongodb:
   mongodb-build.patch (1.1 -> 1.2) , mongodb.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/mongodb/mongodb-build.patch
diff -u packages/mongodb/mongodb-build.patch:1.1 packages/mongodb/mongodb-build.patch:1.2
--- packages/mongodb/mongodb-build.patch:1.1	Mon Nov  7 18:48:21 2011
+++ packages/mongodb/mongodb-build.patch	Thu Dec  1 11:28:04 2011
@@ -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" )
+ 

================================================================
Index: packages/mongodb/mongodb.spec
diff -u packages/mongodb/mongodb.spec:1.18 packages/mongodb/mongodb.spec:1.19
--- packages/mongodb/mongodb.spec:1.18	Thu Dec  1 11:11:12 2011
+++ packages/mongodb/mongodb.spec	Thu Dec  1 11:28:04 2011
@@ -141,7 +141,6 @@
 %{__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 \
@@ -156,7 +155,6 @@
 	$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 \
@@ -254,6 +252,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2011/12/01 10:28:04  baggins
+- fixed libraries ordering for linking
+
 Revision 1.18  2011/12/01 10:11:12  baggins
 - attempt to fix linking of mongod
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mongodb/mongodb-build.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mongodb/mongodb.spec?r1=1.18&r2=1.19&f=u