From 2dd8b29ee0d4d973ab50b8738779e9d203e7f804 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Fri, 19 Aug 2005 16:10:05 +0000 Subject: [PATCH] - Update to boost-1.33.0 - Simplified PYTHON_VERSION by Philipp Thomas - --- Makefile | 19 ++++++++++++++----- boost.spec | 1 - 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 50e0275..22990f2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,15 @@ -# Makefile for source rpm: boost -# $Id$ -NAME := boost -SPECFILE = $(firstword $(wildcard *.spec)) +# Top level Makefile for module boost +all : CVS/Root common-update + @cvs update -include ../common/Makefile.common +common-update : common + @cd common && cvs update + +common : CVS/Root + @cvs checkout common + +CVS/Root : + @echo "ERROR: This does not look like a CVS checkout" && exit 1 + +clean : + @find . -type f -name *~ -exec rm -fv {} \; diff --git a/boost.spec b/boost.spec index b9d27ab..88e56ea 100644 --- a/boost.spec +++ b/boost.spec @@ -51,7 +51,6 @@ rm -rf $RPM_BUILD_ROOT (cd tools/build/jam_src && ./build.sh) #build boost with bjam BJAM=`find tools/build/jam_src/ -name bjam -a -type f` -#PYTHON_VERSION=`python -V 2>&1 |sed 's,.* \([0-9]\.[0-9]\)\(\.[0-9]\)\?.*,\1,'` PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]') PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION" #$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release 1" stage