SPECS: crossmingw32-boost.spec - at least compiles now; dll hacks need some...

[qboosh]

Author: qboosh                       Date: Tue May 13 18:14:47 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- at least compiles now; dll hacks need some more inter-library deps though

---- Files affected:
SPECS:
   crossmingw32-boost.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-boost.spec
diff -u SPECS/crossmingw32-boost.spec:1.8 SPECS/crossmingw32-boost.spec:1.9
--- SPECS/crossmingw32-boost.spec:1.8	Tue May 13 18:36:40 2008
+++ SPECS/crossmingw32-boost.spec	Tue May 13 20:14:42 2008
@@ -100,29 +100,37 @@
 TARGET="%{target}" ; export TARGET
 
 bjam \
-	-q -d2 --toolset=gcc \
-	--without-python --without-serialization --without-test \
-	variant=release threading=multi inlining=on debug-symbols=on \
-	-sBZIP2_BINARY=bzip2
+	-q -d2 \
+	-sBZIP2_BINARY=bzip2 \
+	--toolset=gcc \
+	--without-python \
+	--without-serialization \
+	--without-test \
+	variant=release \
+	debug-symbols=on \
+	inlining=on \
+	link=static,shared \
+	threading=multi \
+	threadapi=win32
 
 mkdir wlib
-cd bin.v2/*
+cd bin.v2/libs
 for i in *
 do
-        cd $i/*/*/*/*/*
-        cd link-static/*
-        $AR cru ../../../../../../../../../../wlib/libboost_$i.a *\.o
-        $RANLIB ../../../../../../../../../../wlib/libboost_$i.a
+        cd $i/build/gcc-mingw-*/release/debug-symbols-on/inlining-on
+        cd link-static/threadapi-win32/threading-multi
+        $AR cru ../../../../../../../../../../../wlib/libboost_$i.a *.o
+        $RANLIB ../../../../../../../../../../../wlib/libboost_$i.a
 
-        cd ../..
+        cd ../../..
 
         # if there is threading-multi dir 
         # it's content is used for dll and implib
-        dll_dir='link-static/*'
-        up_dir='../..'
+        dll_dir='link-static/threadapi-win32/threading-multi'
+        up_dir='../../..'
         if [ -d threading-multi ]; then
-                dll_dir='threading-multi'
-                up_dir='./..'
+                dll_dir='threadapi-win32/threading-multi'
+                up_dir='../..'
         fi
 
         cd $dll_dir
@@ -136,7 +144,7 @@
 
         # there are some issuses with dynamic libboost_wave
         if [ $i != "wave" ]; then
-                $CXX --shared *\.o $additional_so_params \
+                $CXX --shared *.o $additional_so_params \
                         -Wl,--enable-auto-image-base \
                         -o $up_dir/../../../../../../../../wlib/boost_$i.dll \
                         -Wl,--out-implib,libboost_$i.dll.a
@@ -178,6 +186,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2008-05-13 18:14:42  qboosh
+- at least compiles now; dll hacks need some more inter-library deps though
+
 Revision 1.8  2008-05-13 16:36:40  qboosh
 - started update to 1.35.0
 - updated win patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/crossmingw32-boost.spec?r1=1.8&r2=1.9&f=u