[pkg-boost-commits] r14064 - in boost/trunk: . debian
Domenico Andreoli
cavok at alioth.debian.org
Thu May 10 22:02:57 UTC 2007
Author: cavok
Date: 2007-05-10 22:02:56 +0000 (Thu, 10 May 2007)
New Revision: 14064
Removed:
boost/trunk/user-config.jam
Modified:
boost/trunk/debian/changelog
boost/trunk/debian/control
boost/trunk/debian/rules
Log:
fix use of python 2.5 and -mlong-calls on hppa (bug #416496)
Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog 2007-05-10 14:18:47 UTC (rev 14063)
+++ boost/trunk/debian/changelog 2007-05-10 22:02:56 UTC (rev 14064)
@@ -1,3 +1,12 @@
+boost (1.34.0~rc2-2) experimental; urgency=low
+
+ * Re-applied workaround for toolchain bug on hppa (closes: #416496).
+ * Partially synchronized with Ubuntu:
+ - removed "python |" as alternative build dependency
+ - libboost-python-dev now depends on python2.5-dev
+
+ -- Domenico Andreoli <cavok at debian.org> Thu, 10 May 2007 23:22:20 +0200
+
boost (1.34.0~rc2-1) experimental; urgency=low
* Removed debian-specific virtual destructors of
@@ -12,7 +21,7 @@
* libboost-serialization-dev now depends on libboost-serialization1.34.0,
libboost-wave-dev on libboost-wave1.34.0.
- * Build depends on g++-4.1 (>= 4.1.2).
+ * Build depends on g++-4.1 (>= 4.1.2).
-- Domenico Andreoli <cavok at debian.org> Mon, 30 Apr 2007 17:26:55 +0200
@@ -60,6 +69,19 @@
-- Domenico Andreoli <cavok at debian.org> Fri, 5 Jan 2007 10:23:10 +0100
+boost (1.33.1-9ubuntu2) feisty; urgency=low
+
+ * Remove "python |" as alternative build dependency.
+
+ -- Matthias Klose <doko at ubuntu.com> Sun, 14 Jan 2007 17:18:44 +0000
+
+boost (1.33.1-9ubuntu1) feisty; urgency=low
+
+ * Build using python2.5.
+ * Fix build failure on 64bit archs with python2.5.
+
+ -- Matthias Klose <doko at ubuntu.com> Sun, 14 Jan 2007 14:17:42 +0000
+
boost (1.33.1-9) unstable; urgency=low
* boost/property_map_iterator.hpp: added missing namespace. Closes: #397654.
Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control 2007-05-10 14:18:47 UTC (rev 14063)
+++ boost/trunk/debian/control 2007-05-10 22:02:56 UTC (rev 14064)
@@ -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, zlib1g-dev, libbz2-dev, libicu36-dev, python | python-dev | python-all-dev, python2.5-dev, python-support (>= 0.3), g++-4.1 (>= 4.1.2)
+Build-Depends: debhelper (>= 4), bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu36-dev, python-dev | python-all-dev, python2.5-dev, python-support (>= 0.3), g++-4.1 (>= 4.1.2)
Standards-Version: 3.7.2
Package: bcp
@@ -236,7 +236,7 @@
Package: libboost-python-dev
Architecture: any
Section: libdevel
-Depends: libboost-dev (=${Source-Version}), libboost-python1.34.0 (=${Source-Version}), python2.4-dev
+Depends: libboost-dev (=${Source-Version}), libboost-python1.34.0 (=${Source-Version}), python2.5-dev
Replaces: libboost-dev (<< 1.31.0-3)
Description: Boost.Python Library development files
Part of the Boost C++ Libraries collection.
Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules 2007-05-10 14:18:47 UTC (rev 14063)
+++ boost/trunk/debian/rules 2007-05-10 22:02:56 UTC (rev 14064)
@@ -31,10 +31,11 @@
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-CFLAGS=-mlong-calls
+TOOLSET_CONFIG="using gcc : : : <define>_REENTRANT <compileflags>-mlong-calls ;"
ifneq ($(DEB_BUILD_ARCH), hppa)
-CFLAGS=
+TOOLSET_CONFIG="using gcc : : : <define>_REENTRANT ;"
endif
+PYTHON_CONFIG="using python : 2.5 : /usr ;"
exampledir = debian/libboost-doc/usr/share/doc/libboost-doc/examples
htmldir = debian/libboost-doc/usr/share/doc/libboost-doc/HTML
@@ -50,12 +51,15 @@
build-stamp: $(bjam)
dh_testdir
+ echo $(TOOLSET_CONFIG) >> user-config.jam
+ echo $(PYTHON_CONFIG) >> user-config.jam
+
cd tools/bcp && ../../$(JAM)
cd tools/inspect/build && ../../../$(JAM)
cd tools/wave/build && ../../../$(JAM)
cd tools/regression/build && ../../../$(JAM)
- $(JAM) -sBUILD="release debug <cflags>$(CFLAGS) <define>_REENTRANT <threading>single/multi"
+ $(JAM) -sBUILD="release debug <threading>single/multi"
cd libs/python/pyste/install && python2.5 setup.py build
touch build-stamp
@@ -67,13 +71,14 @@
-cd tools && ../$(JAM) clean
-$(JAM) clean
- cd libs/python/pyste/install && python setup.py clean
+ cd libs/python/pyste/install && python2.5 setup.py clean
rm -rf libs/python/pyste/install/build
rm -rf tools/jam/src/bootstrap
rm -rf tools/jam/src/bin.*
rm -ff tools/jam/src/bjam
rm -rf bin.v2 dist
+ rm -rf user-config.jam
dh_clean
Deleted: boost/trunk/user-config.jam
===================================================================
--- boost/trunk/user-config.jam 2007-05-10 14:18:47 UTC (rev 14063)
+++ boost/trunk/user-config.jam 2007-05-10 22:02:56 UTC (rev 14064)
@@ -1,7 +0,0 @@
-# Boost.Build Configuration
-
-# Compiler configuration
-using gcc ;
-
-# Python configuration
-using python : 2.5 : /usr ;
More information about the pkg-boost-commits
mailing list