# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1344531228 -7200
# Node ID 3695593c147afb72c1277a8e0e518da369ecf23d
# Parent  c4f4c533995f88d2bd6aae670a0db542de605a8b
Correct threading, static linking, use parallel build, and update version.

diff -r c4f4c533995f -r 3695593c147a boost/boost.spec
--- a/boost/boost.spec	Thu Aug 09 18:52:06 2012 +0200
+++ b/boost/boost.spec	Thu Aug 09 18:53:48 2012 +0200
@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_openpkg    1.49.0
-%define       V_dist       1_49_0
+%define       V_openpkg    1.50.0
+%define       V_dist       1_50_0
 
 #   package information
 Name:         boost
@@ -36,7 +36,7 @@
 Group:        Language
 License:      Boost Software License
 Version:      %{V_openpkg}
-Release:      20120722
+Release:      20120800
 
 #   package options
 %option       with_debug     yes
@@ -94,12 +94,12 @@
         --libdir=%{l_prefix}/lib \
         --without-libraries=python
 
-    %{l_shtool} mkdir -p obj
+    %{l_shtool} mkdir -p objbld
 
     #   configure build options for bjam(1) -sBUILD parameter
     debugopts="release"
     optimizeopts="<optimization>off"
-    threadopts="<threading>single"
+    threadopts="threading=single"
 %if "%{with_debug}" == "yes"
     debugopts="$debugopts debug"
 %endif
@@ -107,11 +107,12 @@
     optimizeopts="<optimization>speed <inlining>full"
 %endif
 %if "%{with_threads}" == "yes"
-    threadopts="<threading>single/multi"
+    threadopts="threading=single,multi"
 %endif
+    cpusmp=`echo %{l_mflags -O} | %{l_shtool} subst -e 's;.*\(\-j *[1-9][0-9]*\).*;\1;'`
 
     #   build all libraries
-    ./b2 --toolset=gcc --layout=system --builddir=obj "-sBUILD=$debugopts $optimizeopts $threadopts" \
+    ./b2 --toolset=gcc --layout=tagged --builddir=objbld "-sBUILD=$debugopts $optimizeopts" \
 %if "%{with_zlib}" == "yes"
         "-sNO_COMPRESSION=0" "-sZLIB_INCLUDE=%{l_prefix}/include" "-sZLIB_LIBPATH=%{l_prefix}/lib" \
 %else
@@ -122,26 +123,15 @@
 %else
         "-sNOBZIP2=1" \
 %endif
-        link=static stage
+        $threadopts link=static stage $cpusmp
 
 %install
-    ./bjam --toolset=gcc --layout=system --prefix=$RPM_BUILD_ROOT%{l_prefix} \
-%if "%{with_zlib}" == "yes"
-        "-sNO_COMPRESSION=0" "-sZLIB_INCLUDE=%{l_prefix}/include" "-sZLIB_LIBPATH=%{l_prefix}/lib" \
-%else
-        "-sNOZLIB=1" \
+    threadopts="threading=single"
+%if "%{with_threads}" == "yes"
+    threadopts="threading=single,multi"
 %endif
-%if "%{with_bzip2}" == "yes"
-        "-sNO_COMPRESSION=0" "-sBZIP2_INCLUDE=%{l_prefix}/include" "-sBZIP2_LIBPATH=%{l_prefix}/lib" \
-%else
-        "-sNOBZIP2=1" \
-%endif
-        install
-    rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/boost-*
-    find $RPM_BUILD_ROOT%{l_prefix}/lib/ \
-        -name "*.so" -print -o \
-        -name "libboost_*.so.%{V_openpkg}" \
-        -print | xargs rm -f
+    ./bjam --toolset=gcc --layout=tagged --prefix=$RPM_BUILD_ROOT%{l_prefix} \
+        $threadopts link=static install
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/bin
     %{l_shtool} install -c -m 755 \