From 0e64038afeef08b1ee4acfb7f2e1908dcd20f787 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 12 Dec 2007 14:00:46 +0000 Subject: [PATCH] INTEGRATION: CWS boostup01 (1.10.20); FILE MERGED 2007/11/29 10:33:29 thb 1.10.20.2: #i82516# Avoiding duplication 2007/11/08 14:00:45 thb 1.10.20.1: #i77672# Tentatively enabling boost 1.34.1 for gcc4.x --- boost/makefile.mk | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/boost/makefile.mk b/boost/makefile.mk index ed857737504f..ba746ed794df 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: obo $ $Date: 2007-01-25 12:32:17 $ +# last change: $Author: kz $ $Date: 2007-12-12 15:00:46 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -59,6 +59,16 @@ all: TARFILE_NAME=boost-1.30.2 PATCH_FILE_NAME=$(TARFILE_NAME).patch +.IF "$(COMID)"=="gcc3" + +# enabled for gcc4.x +.IF "$(CCNUMVER)">="000400000000" + TARFILE_NAME=boost_1_34_1 + PATCH_FILE_NAME=$(TARFILE_NAME).patch +.ENDIF + +.ENDIF + CONFIGURE_DIR= CONFIGURE_ACTION=