[pkg-boost-commits] r14165 - in boost/trunk: debian tools/jam/src

[smr at alioth.debian.org]

Author: smr
Date: 2008-02-19 02:37:41 +0000 (Tue, 19 Feb 2008)
New Revision: 14165

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rules
   boost/trunk/tools/jam/src/build.jam
Log:
Remove build-dependency on gcc-4.1 by building bjam using -fno-strict-aliasing.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-02-19 02:26:00 UTC (rev 14164)
+++ boost/trunk/debian/changelog	2008-02-19 02:37:41 UTC (rev 14165)
@@ -6,6 +6,12 @@
   * debian/control: Move the homepage lines from the extended descriptions
     to a proper header; clears up lintian warning
     description-contains-homepage.
+  
+  * tools/jam/src/build.jam: Build using -fno-strict-aliasing, to avoid a
+    segfault.  Patch obtained from upstream changeset 41036; c.f. bug
+    #367825 and boost ticket 977 (http://svn.boost.org/trac/boost/ticket/977).
+  * debian/rules: Do not build bjam with CC=gcc-4.1.
+  * debian/control: Do not build-depend on gcc-4.1.  Closes: #463287.
 
  -- Steve M. Robbins <smr at debian.org>  Mon, 18 Feb 2008 16:13:32 -0600
 

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2008-02-19 02:26:00 UTC (rev 14164)
+++ boost/trunk/debian/control	2008-02-19 02:37:41 UTC (rev 14165)
@@ -4,7 +4,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, libicu-dev, python-dev | python-all-dev, python2.4-dev, python-support (>= 0.3), g++-4.2, gcc-4.1
+Build-Depends: debhelper (>= 4), bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-dev | python-all-dev, python2.4-dev, python-support (>= 0.3), g++-4.2
 Standards-Version: 3.7.2
 
 Package: bcp

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2008-02-19 02:26:00 UTC (rev 14164)
+++ boost/trunk/debian/rules	2008-02-19 02:37:41 UTC (rev 14165)
@@ -86,9 +86,6 @@
 
 JAM = $(bjam) $(JOBS) -d2 --user-config=$(CURDIR)/user-config.jam -sHAVE_ICU=1
 
-# BJAM segfaults if built with GCC 4.2, so build with GCC 4.1 to avoid problems.
-# See 367825 for a proper fix.
-$(bjam): CC=gcc-4.1
 $(bjam):
 	cd tools/jam/src && sh build.sh cc && mv bin.*/bjam .
 

Modified: boost/trunk/tools/jam/src/build.jam
===================================================================
--- boost/trunk/tools/jam/src/build.jam	2008-02-19 02:26:00 UTC (rev 14164)
+++ boost/trunk/tools/jam/src/build.jam	2008-02-19 02:37:41 UTC (rev 14165)
@@ -152,7 +152,7 @@
     : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
 ## GCC 2.x, 3.x, 4.x
 toolset gcc gcc : "-o " : -D
-    : -pedantic
+    : -pedantic -fno-strict-aliasing
     [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
     [ opt --debug : -g -O0 -fno-inline ]
     -I$(--python-include) -Wno-long-long