[pkg-boost-commits] r13880 - boost/trunk/debian

[Domenico Andreoli]

Author: cavok
Date: 2005-10-30 22:44:57 +0000 (Sun, 30 Oct 2005)
New Revision: 13880

Modified:
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
hppa and m68k build with gcc 3.4

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2005-10-27 12:32:06 UTC (rev 13879)
+++ boost/trunk/debian/control	2005-10-30 22:44:57 UTC (rev 13880)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Boost Team <pkg-boost-devel at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>, Domenico Andreoli <cavok at debian.org>, Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: debhelper (>= 4), bison, flex, docbook-to-man, xsltproc, doxygen, python2.3-dev, zlib1g-dev, libbz2-dev, libicu34-dev
+Build-Depends: debhelper (>= 4), bison, flex, docbook-to-man, xsltproc, doxygen, python2.3-dev, zlib1g-dev, libbz2-dev, libicu34-dev, gcc-3.4 [hppa, m68k], g++-3.4 [hppa, m68k]
 Standards-Version: 3.6.2
 
 Package: bcp

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2005-10-27 12:32:06 UTC (rev 13879)
+++ boost/trunk/debian/rules	2005-10-30 22:44:57 UTC (rev 13880)
@@ -26,6 +26,17 @@
 #
 SOVERSION = 1.33.0
 
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+GCC=gcc-3.4
+GXX=g++-3.4
+ifneq ($(DEB_BUILD_ARCH), hppa)
+ifneq ($(DEB_BUILD_ARCH), m68k)
+GCC=gcc
+GXX=g++
+endif
+endif
+
 exampledir = debian/libboost-doc/usr/share/doc/libboost-doc/examples
 htmldir = debian/libboost-doc/usr/share/doc/libboost-doc/HTML
 
@@ -33,8 +44,8 @@
 
 JAM = $(bjam) -d2 \
 	-sTOOLS=gcc \
-	-sGCC=gcc \
-	-sGXX=g++ \
+	-sGCC=$(GCC) \
+	-sGXX=$(GXX) \
 	-sHAVE_ICU=1 \
 	-sPYTHON_VERSION=2.3 \
 	-sPYTHON_ROOT=/usr