summaryrefslogtreecommitdiff
path: root/boost
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-12-12 14:04:26 +0000
committerKurt Zenker <kz@openoffice.org>2007-12-12 14:04:26 +0000
commit6af9273ca6a5142db829cb9d59c83b8da21a4ba8 (patch)
tree592888fa9d73e01bd97e8c1ec1297d4c46044865 /boost
parentce5dd9aee2515315acc4603447628ac7e562a5d2 (diff)
INTEGRATION: CWS boostup01 (1.6.20); FILE MERGED
2007/11/08 14:00:46 thb 1.6.20.1: #i77672# Tentatively enabling boost 1.34.1 for gcc4.x
Diffstat (limited to 'boost')
-rw-r--r--boost/spirit/makefile.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/boost/spirit/makefile.mk b/boost/spirit/makefile.mk
index c2100d6..4648ff0 100644
--- a/boost/spirit/makefile.mk
+++ b/boost/spirit/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: obo $ $Date: 2007-01-25 12:32:42 $
+# last change: $Author: kz $ $Date: 2007-12-12 15:04:26 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -60,6 +60,11 @@ all:
# --- Files --------------------------------------------------------
+.IF "$(COMID)"=="gcc3" && "$(CCNUMVER)">="000400000000"
+all:
+ @echo "spirit is already included in boost 1.34"
+.ELSE
+
TARFILE_NAME=spirit-1.6.1
PATCH_FILE_NAME=$(TARFILE_NAME).patch
@@ -88,3 +93,4 @@ $(MISC)$/$(TARGET)_remove_build.flag : $(PRJ)$/$(PATCH_FILE_NAME)
$(TOUCH) $(MISC)$/$(TARGET)_remove_build.flag
.ENDIF
+.ENDIF