Bug#1086347: bookworm-pu: package bochs/2.7+dfsg-4

[Stephen Kitt <skitt@debian.org>]

Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org@packages.debian.org
Usertags: pu

Dear release team,

[ Reason ]

One of the BIOS images in Bochs is built for the default GCC
architecture, rather than the expected i386. This causes the BIOS to
crash, making some configurations unworkable. See #1082917 for details.

[ Impact ]

Some configurations crash the emulated environment.

[ Tests ]

I’ve reproduced #1082917 and verified the fix; the reporter has
confirmed the fix on Debian 12 too (using the updated BIOS image with
the bookworm package).

[ Risks ]

This aligns the Debian build with the upstream build. Only one file is
affected; it doesn’t work currently, and works with the fix. I don’t
see any downside.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]

This sets -march=i386 when building the “latest” BIOS image, to ensure
that the generated code works on emulated 386 CPUs.

[ Other info ]

Nothing I can think of.

Regards,

Stephen

commit 5fe14a8558fb1d233ec551f8a3e9f65de29991ea
Author: Stephen Kitt <skitt@debian.org>
Date:   Mon Oct 14 23:32:10 2024 +0200

    Build the BIOS images for 386 CPUs
    
    Closes: #1082917.

diff --git a/debian/changelog b/debian/changelog
index 3717c0f..7ec779c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bochs (2.7+dfsg-4+deb12u1) bookworm-proposed-updates; urgency=medium
+
+  * Build the BIOS images for 386 CPUs rather than the compiler’s 32-bit
+    default. Closes: #1082917.
+
+ -- Stephen Kitt <skitt@debian.org>  Tue, 15 Oct 2024 22:08:06 +0200
+
 bochs (2.7+dfsg-4) unstable; urgency=medium
 
   * Switch to wxwidgets3.2. Closes: #1019842.
diff --git a/debian/rules b/debian/rules
index b1df78d..766a69e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,7 @@ endif
 
 override_dh_auto_build-indep:
 # bochsbios
-	$(MAKE) -C bios GCC32="i686-linux-gnu-gcc -fno-stack-protector" LD32="i686-linux-gnu-ld" OBJCOPY32="i686-linux-gnu-objcopy"
+	$(MAKE) -C bios GCC32="i686-linux-gnu-gcc -march=i386 -fno-stack-protector" LD32="i686-linux-gnu-ld" OBJCOPY32="i686-linux-gnu-objcopy"
 
 # bochs-doc
 	$(MAKE) -C doc/docbook USE_JADE=1