Package: boost
Version: 1.34.1-14
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu ubuntu-patch jaunty

Hi folks,

I see in the latest version of boost that you're setting
CFLAGS=-fno-strict-aliasing directly in debian/rules.  This is somewhat
suboptimal; first, because there's already a patch in the package
(debian/patches/bjam-no-strict-aliasing) to do exactly this, and second,
because this clobbers any CFLAGS value that might have been set in the
package build environment with the intent that it be picked up by packages
(e.g., build hardening flags).

The attached patch is used in Ubuntu to ensure bjam uses 'gcc' instead of
'cc' as its compiler, allowing debian/patches/bjam-no-strict-aliasing to
take effect without clobbering other build flags.  I believe this would be
appropriate to apply in Debian as well.

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
[EMAIL PROTECTED]                                     [EMAIL PROTECTED]
diff -u boost-1.34.1/debian/rules boost-1.34.1/debian/rules
--- boost-1.34.1/debian/rules
+++ boost-1.34.1/debian/rules
@@ -132,7 +132,7 @@
 JAM = $(bjam) $(JOBS) -d2 --user-config=$(CURDIR)/user-config.jam -sHAVE_ICU=1
 
 $(bjam):
-	cd tools/jam/src && CFLAGS=-fno-strict-aliasing sh build.sh cc && mv bin.*/bjam .
+	cd tools/jam/src && sh build.sh gcc && mv bin.*/bjam .
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN) $(bjam)
diff -u boost-1.34.1/debian/changelog boost-1.34.1/debian/changelog
--- boost-1.34.1/debian/changelog
+++ boost-1.34.1/debian/changelog
@@ -1,3 +1,14 @@
+boost (1.34.1-14ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    + Tell bjam that we're using gcc; otherwise, the -fno-strict-aliasing
+      fix for building with gcc-4.2 fails when CFLAGS is set in the
+      environment.
+    + GCCXMLParser.py: Use ElementTree from the python2.5 standard
+      library.
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Sat, 15 Nov 2008 21:00:46 -0800
+
 boost (1.34.1-14) unstable; urgency=low
 
   * debian/rules: Build bootstrap jam with -fno-strict-aliasing.  This time

Reply via email to