[ooo-build-commit] .: boost/boost_1_39_0.patch boost/makefile.mk boost/prj

[Tor Lillqvist]

 boost/boost_1_39_0.patch |   24 ++++++++++++++++++++++++
 boost/makefile.mk        |   11 +++++++----
 boost/prj/d.lst          |    1 +
 3 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit b8016aa4f5106d6275c5417666662503b7c767c9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Oct 2 00:39:37 2010 +0300

    Build the thread-related code on Windows into a library
    
    Needed by ixion.

diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch
index d837246..db4dba4 100644
--- a/boost/boost_1_39_0.patch
+++ b/boost/boost_1_39_0.patch
@@ -285,3 +285,27 @@ index 5d75be2..730cf0c 100644
                  ).second;
              }
  
+--- misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk
++++ misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk
+@@ -0,0 +1,21 @@
++PRJ=..$/..$/..$/..$/..$/..$/..$/..
++
++PRJNAME=boostthread
++TARGET=boostthread
++LIBTARGET=NO
++
++.IF "$(GUI)"=="WNT"
++
++.INCLUDE :  settings.mk
++
++SLOFILES=	$(SLO)$/exceptions.obj \
++			$(SLO)$/thread.obj \
++			$(SLO)$/tss_dll.obj \
++			$(SLO)$/tss_pe.obj
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
++LIB1OBJFILES=$(SLOFILES)
++
++.INCLUDE :  target.mk
++.ENDIF
diff --git a/boost/makefile.mk b/boost/makefile.mk
index bf3da7a..ac605a8 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -55,16 +55,13 @@ PATCH_FILES=$(TARFILE_NAME).patch
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
 
-BUILD_DIR=
-BUILD_ACTION=
-BUILD_FLAGS=
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
 
+
 # --- post-build ---------------------------------------------------
 
 # "normalize" the output structure, in that the C++ headers are
@@ -113,4 +110,10 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
 normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
 
 $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
+
+$(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : boostthreadlib
+
+boostthreadlib :
+    cd $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/libs/thread/src/win32 && dmake $(MFLAGS) $(CALLMACROS)
+
 .ENDIF			# "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
diff --git a/boost/prj/d.lst b/boost/prj/d.lst
index f25224b..185ac0f 100644
--- a/boost/prj/d.lst
+++ b/boost/prj/d.lst
@@ -372,3 +372,4 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
 ..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail
 ..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant
 ..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail
+..\%__SRC%\slb\boostthread.lib %_DEST%\lib%_EXT%\boostthread.lib