diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-06 09:09:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-06 09:09:48 +0000 |
| commit | 22d47f11791f96ae11fa32c7daefba771b22ee67 (patch) | |
| tree | 2ff1cc65d22e6e45401f8daf4e50e49da91ac896 /boost | |
| parent | 9443fe322c7af93f03e39edd626e8305b8398edd (diff) | |
INTEGRATION: CWS ccpatch (1.7.10); FILE MERGED
2005/04/01 13:52:26 dbo 1.7.10.1: #120732# workaround sunpro CC opt bug for safe-bool idiom
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/makefile.mk | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/boost/makefile.mk b/boost/makefile.mk index 182593abbd11..41e33dc880aa 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: kz $ $Date: 2005-01-18 16:19:10 $ +# last change: $Author: hr $ $Date: 2005-04-06 10:09:48 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -60,6 +60,10 @@ # #************************************************************************* +# dmake create_clean -- just unpacks +# dmake patch -- unpacks and applies patch file +# dmake create_patch -- creates a patch file + PRJ=. PRJNAME=ooo_boost @@ -69,7 +73,9 @@ TARGET=ooo_boost .INCLUDE : settings.mk -.IF "$(SYSTEM_BOOST)" == "YES" +# force patched boost for sunpro CC +# to workaround opt bug when compiling with -xO3 +.IF "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC") all: @echo "An already available installation of boost should exist on your system." @echo "Therefore the version provided here does not need to be built in addition." @@ -78,6 +84,7 @@ all: # --- Files -------------------------------------------------------- TARFILE_NAME=boost-1.30.2 +PATCH_FILE_NAME=$(TARFILE_NAME).patch CONFIGURE_DIR= CONFIGURE_ACTION= @@ -88,8 +95,19 @@ BUILD_FLAGS= # --- Targets ------------------------------------------------------ +all: \ + $(MISC)$/$(TARGET)_remove_build.flag \ + ALLTAR + .INCLUDE : set_ext.mk .INCLUDE : target.mk .INCLUDE : tg_ext.mk +# Since you never know what will be in a patch (for example, it may already +# patch at configure level), we remove the entire package directory if a patch +# is newer. +$(MISC)$/$(TARGET)_remove_build.flag : $(PRJ)$/$(PATCH_FILE_NAME) + $(REMOVE_PACKAGE_COMMAND) + +$(TOUCH) $(MISC)$/$(TARGET)_remove_build.flag + .ENDIF |