source: boost1.83
version: 1.83.0-1
severity: important
tags: patch

The boost1.83 fails to build on x32.

The debian/rules file has a special rule commenting out a line in
tools/build/src/tools/gcc.jam on x32. This is not sufficient and a
second line must be commented out for the compilation to work.

The attached patch modifies the debian/rules file accordingly.

I can make an NMU upload if you are happy with the modification.

Mattias.
From 85520090f1b100d87d0710a2ffd482d7f39e556c Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ell...@physics.uu.se>
Date: Thu, 22 Aug 2024 17:41:17 +0200
Subject: [PATCH] Additional workaround for broken architecture detection under
 x32

---
 debian/changelog | 7 +++++++
 debian/rules     | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8509c6bf8..b92c09391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boost1.83 (1.83.0-3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Additional workaround for broken architecture detection under x32.
+
+ -- Mattias Ellert <mattias.ell...@physics.uu.se>  Thu, 22 Aug 2024 14:09:24 +0200
+
 boost1.83 (1.83.0-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/rules b/debian/rules
index 5acc8a88a..871942eab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,7 +182,9 @@ JAM_DOC = $(b2) $(JOBS) -q -d2 --ignore-site-config --user-config=$(CURDIR)/user
 override_dh_auto_configure: user-config.jam make-debhelper
 ifeq ($(DEB_BUILD_ARCH), x32)
 	cp tools/build/src/tools/gcc.jam tools/build/src/tools/gcc.jam.bak
-	sed -i -e 's|^.*compile-link-flags.*-m32.*|#\0|g' tools/build/src/tools/gcc.jam
+	sed -i -e 's|^.*compile-link-flags.*-m32.*|#\0|g' \
+	       -e 's|^.*toolset.flags.*-march=i686.*|#\0|g' \
+		tools/build/src/tools/gcc.jam
 endif
 
 override_dh_auto_build-common: $(b2) b2.1 bjam.1
-- 
2.45.2

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to