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

[Fridrich Strba]

 boost/boost_1_39_0.patch |    5 +++--
 boost/makefile.mk        |    3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c4692a5bad7c10e0fee77b4e49bd5dfb6cad265e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Oct 4 22:04:38 2010 +0200

    Fix boost build
    
    Normal libreoffice way to add a file is to put that in makefile.mk into ADDITIONAL_FILES list
    which creates a file with "dummy" as content and then to patch that file with the real content.
    This prevents a patching hell if timestamps change and boost is unpacked again

diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch
index 4f1059a..46395dd 100644
--- a/boost/boost_1_39_0.patch
+++ b/boost/boost_1_39_0.patch
@@ -285,9 +285,10 @@ index 5d75be2..730cf0c 100644
                  ).second;
              }
  
---- /dev/null
+--- 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 @@
+@@ -1,1 +1,21 @@
+-dummy
 +PRJ=..$/..$/..$/..$/..$/..$/..$/..
 +
 +PRJNAME=boostthread
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 2747a55..3d80a89 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -52,6 +52,9 @@ TARFILE_NAME=boost_1_39_0
 TARFILE_MD5=fcc6df1160753d0b8c835d17fdeeb0a7
 PATCH_FILES=$(TARFILE_NAME).patch
 
+ADDITIONAL_FILES= \
+    libs/thread/src/win32/makefile.mk
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=