diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-10-04 22:04:38 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-10-04 22:04:38 +0200 |
| commit | 20612b2243dcff16137aee81b389338ba9be2bcb (patch) | |
| tree | bfe7c5c8b08b1c98d1544317cf22929223c3a7be /boost | |
| parent | c4a8c2671db750856976fbc6c39f3859ede26455 (diff) | |
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
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/boost_1_39_0.patch | 5 | ||||
| -rw-r--r-- | boost/makefile.mk | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch index 4f1059ac1c98..46395dda2f83 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 2747a551e4d5..3d80a8943143 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= |