[med-svn] [Git][med-team/praat][master] Avoid FTBFS on i386

[Rafael Laboissière (@rafael)]

Rafael Laboissière pushed to branch master at Debian Med / praat


Commits:
aaf9e436 by Rafael Laboissière at 2023-10-21T13:09:25-03:00
Avoid FTBFS on i386

+ d/p/ftbfs-on-i386-with-g++13.patch: Drop patch
+ d/mk-vars-hardening: Add option -fexcess-precision=fast to CXXFLAGS

Gbp-Dch: Full
Thanks: Adrian Bunk for the tip (see https://github.com/praat/praat/issues/2433)

- - - - -


2 changed files:

- debian/mk-vars-hardening
- − debian/patches/ftbfs-on-i386-with-g++13.patch


Changes:

=====================================
debian/mk-vars-hardening
=====================================
@@ -1,2 +1,2 @@
 CFLAGS += $(shell dpkg-buildflags  --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
-CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS)
+CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS) -fexcess-precision=fast


=====================================
debian/patches/ftbfs-on-i386-with-g++13.patch deleted
=====================================
@@ -1,28 +0,0 @@
-Description: Fix build on i386 when compiling with g++ v13
- The i386 is the only official architecture for which the package
- FTBFS [1]. The present patch is a hacky attempt to “fix” the problem
- by just commenting the offending lines.
- .
- [1] https://buildd.debian.org/status/fetch.php?pkg=praat&arch=i386&ver=6.3.11-1&stamp=1689959453&raw=0
-Author: Rafael Laboissière <rafael at debian.org>
-Bug: https://github.com/praat/praat/issues/2433
-Forwarded: not-needed
-Last-Update: 2023-08-24
-
---- praat-6.3.11.orig/sys/praat.cpp
-+++ praat-6.3.11/sys/praat.cpp
-@@ -2212,10 +2212,10 @@ void praat_run () {
- 		//autoVEC b { x };   // "No matching constructor for initialization of autoVEC" (2021-04-05)
- 		//autoVEC c = x;   // "No viable conversion from VEC to autoVEC" (2021-04-05)
- 		double aa [] = { 3.14, 2.718 };
--		VEC x3 (aa, 2);   // initializes x3 to 2 values from a base-0 array
--		Melder_assert (x3 [2] == 2.718);
--		autoVEC x4 = { 3.14, 2.718 };
--		Melder_assert (x4 [2] == 2.718);
-+		//VEC x3 (aa, 2);   // initializes x3 to 2 values from a base-0 array
-+		//Melder_assert (x3 [2] == 2.718);
-+ 		//autoVEC x4 = { 3.14, 2.718 };
-+ 		//Melder_assert (x4 [2] == 2.718);
- 	}
- 	Melder_assert (Melder_iroundUpToPowerOfTwo (-10) == 1);
- 	Melder_assert (Melder_iroundUpToPowerOfTwo (-1) == 1);



View it on GitLab: https://salsa.debian.org/med-team/praat/-/commit/aaf9e4362a0f4c28a8a475bc86fafb271a876714

-- 
View it on GitLab: https://salsa.debian.org/med-team/praat/-/commit/aaf9e4362a0f4c28a8a475bc86fafb271a876714
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20231021/435a94c7/attachment-0001.htm>