Bug#1133140: closed by Debian FTP Masters <ftpmaster at ftp-master.debian.org> (reply to Roland Mas <lolando at debian.org>) (Bug#1133140: fixed in libformfactor 0.3.2-2)

[Adrian Bunk]

Control: reopen -1
Control: tags -1 patch

This did not work, but the following change against 0.3.2-4 fixes
the build (removing 0003 is not necessary, but it is no longer needed):

diff -Nru libformfactor-0.3.2/debian/patches/0003-Increase-numerical-tolerance-for-i386.patch libformfactor-0.3.2/debian/patches/0003-Increase-numerical-tolerance-for-i386.patch
--- libformfactor-0.3.2/debian/patches/0003-Increase-numerical-tolerance-for-i386.patch	2026-05-15 19:17:37.000000000 +0300
+++ libformfactor-0.3.2/debian/patches/0003-Increase-numerical-tolerance-for-i386.patch	1970-01-01 02:00:00.000000000 +0200
@@ -1,42 +0,0 @@
-From: Roland Mas <roland.mas at entierement.net>
-Date: Tue, 12 May 2026 17:17:45 +0200
-Subject: Increase numerical tolerance for i386
-
----
- test/Triangle.cpp | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/test/Triangle.cpp b/test/Triangle.cpp
-index 74eb742..07cdfad 100644
---- a/test/Triangle.cpp
-+++ b/test/Triangle.cpp
-@@ -7,6 +7,12 @@
- //!
- //! Used while preparing polyhedral form factor manuscript for publication - JWu, dec 2020.
- 
-+#if defined(__i386__)
-+#define TRIANGLE_TOLERANCE 1e-12
-+#else
-+#define TRIANGLE_TOLERANCE 7e-16
-+#endif
-+
- TEST_CASE("FF:Triangle", "")
- {
-     const double a = 1.;
-@@ -30,14 +36,14 @@ TEST_CASE("FF:Triangle", "")
-             const double f1 = std::abs(T.ff_2D_direct(Q));
-             const double f2 = std::abs(T.ff_2D_expanded(Q));
-             const double relerr = std::abs(f1 - f2) / f2;
--            if (relerr > 7e-16) {
-+            if (relerr > TRIANGLE_TOLERANCE) {
-                 printf("ERR1 %9.6f %16.11e %21.16e %21.16e %10.4e\n", phi, q, f1, f2, relerr);
-                 ++failures;
-             }
-             if (q > 1e-7)
-                 continue;
-             const double relerr2 = std::abs(f1 - T.area()) / f2;
--            if (relerr2 > 7e-16) {
-+            if (relerr2 > TRIANGLE_TOLERANCE) {
-                 printf("ERR2 %9.6f %16.11e %21.16e %21.16e %10.4e\n", phi, q, f1, f2, relerr2);
-                 ++failures;
-             }
diff -Nru libformfactor-0.3.2/debian/patches/series libformfactor-0.3.2/debian/patches/series
--- libformfactor-0.3.2/debian/patches/series	2026-05-15 19:17:37.000000000 +0300
+++ libformfactor-0.3.2/debian/patches/series	2026-05-15 19:17:37.000000000 +0300
@@ -1,3 +1,2 @@
 0001-Fix-installation-path-for-.cmake-files.patch
 0002-Fix-installation-paths-for-.so-files.patch
-0003-Increase-numerical-tolerance-for-i386.patch
diff -Nru libformfactor-0.3.2/debian/rules libformfactor-0.3.2/debian/rules
--- libformfactor-0.3.2/debian/rules	2026-05-15 19:17:37.000000000 +0300
+++ libformfactor-0.3.2/debian/rules	2026-05-15 19:17:37.000000000 +0300
@@ -5,6 +5,10 @@
 
 CONFIG_SWITCHES=-DCMAKE_DEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)
 
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU), i386))
+  export DEB_CXXFLAGS_MAINT_APPEND += -ffloat-store
+endif
+
 %:
 	dh $@