Bug#1033798: unblock: lazarus/2.2.6+dfsg1-1

[Abou Al Montacir <abou.almontacir@sfr.fr>]

Control: retitle -1 unblock: lazarus/2.2.6+dfsg1-2

Another bug was fixed in order to allow building Lazarus for armel architecture.

This bug is just disabling a compilation switch in a source file.

The removed compilation switch forces to disable the FPU emulation, which does not have any sense on armel as it does not have any hardware FPU.

The fix should not alter other architectures as when the switch is not supplied, FPC will decide automatically whether to use HW FPU of emulation.

Attached the debdiff of this altest modification.

-- 

Cheers,
Abou Al Montacir

diff -Nru lazarus-2.2.6+dfsg1/debian/changelog lazarus-2.2.6+dfsg1/debian/changelog
--- lazarus-2.2.6+dfsg1/debian/changelog	2023-03-31 19:51:15.000000000 +0200
+++ lazarus-2.2.6+dfsg1/debian/changelog	2023-04-01 19:28:43.000000000 +0200
@@ -1,3 +1,9 @@
+lazarus (2.2.6+dfsg1-2) unstable; urgency=medium
+
+  * Fixed compilation of test suite on armel.
+
+ -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sat, 01 Apr 2023 19:28:43 +0200
+
 lazarus (2.2.6+dfsg1-1) unstable; urgency=medium
 
   * New upstream version 2.2.6+dfsg1
diff -Nru lazarus-2.2.6+dfsg1/debian/patches/Fixed-compilation-of-testsuite-on-armel.patch lazarus-2.2.6+dfsg1/debian/patches/Fixed-compilation-of-testsuite-on-armel.patch
--- lazarus-2.2.6+dfsg1/debian/patches/Fixed-compilation-of-testsuite-on-armel.patch	1970-01-01 01:00:00.000000000 +0100
+++ lazarus-2.2.6+dfsg1/debian/patches/Fixed-compilation-of-testsuite-on-armel.patch	2023-04-01 19:26:12.000000000 +0200
@@ -0,0 +1,23 @@
+Description: Fixed compilation of test suite on armel.
+ The crash was due to a source file disabling FPU emulation.
+ However, on armel, FPU emulation is needed as no hardware FPU
+ is present.
+ .
+ This patch removed the compiler flag that disabled the FPU emulation.
+ This should not harm, as on other targets, the compiler will by default use
+ the hardware FPU.
+Author: Abou Al Montacir <abou.almontacir@sfr.fr>
+
+diff --git a/components/lazreport/source/addons/addfunction/frFuncNum.pas b/components/lazreport/source/addons/addfunction/frFuncNum.pas
+index 769a340d..75e9c037 100644
+--- a/components/lazreport/source/addons/addfunction/frFuncNum.pas
++++ b/components/lazreport/source/addons/addfunction/frFuncNum.pas
+@@ -10,7 +10,7 @@ unit frFuncNum;
+ 
+ interface
+ 
+-{$A+,B-,E-,R-}
++{$A+,B-,R-}
+ {.$I FR.inc}
+ 
+ uses
diff -Nru lazarus-2.2.6+dfsg1/debian/patches/series lazarus-2.2.6+dfsg1/debian/patches/series
--- lazarus-2.2.6+dfsg1/debian/patches/series	2023-03-31 19:51:08.000000000 +0200
+++ lazarus-2.2.6+dfsg1/debian/patches/series	2023-04-01 19:26:12.000000000 +0200
@@ -8,3 +8,4 @@
 Fixed-end-of-line-for-resource-file.diff
 Fixed-allowing-arbitrary-FPPKG-path.patch
 Added-missing-source-file.patch
+Fixed-compilation-of-testsuite-on-armel.patch
diff -Nru lazarus-2.2.6+dfsg1/debian/source/timestamps lazarus-2.2.6+dfsg1/debian/source/timestamps
--- lazarus-2.2.6+dfsg1/debian/source/timestamps	2023-03-25 15:09:07.000000000 +0100
+++ lazarus-2.2.6+dfsg1/debian/source/timestamps	2023-04-01 19:28:07.000000000 +0200
@@ -1,5 +1,6 @@
 components/PascalScript/Source/arm.inc 2020-08-08T09:46+00:00
 components/PascalScript/Source/pascalscriptfcl.pas 2022-01-28T09:54+00:00
+components/lazreport/source/addons/addfunction/frFuncNum.pas 2023-04-01T17:28+00:00
 ide/codehelp.pas 2020-07-11T19:46+00:00
 ide/generatefppkgconfigurationdlg.pas 2022-01-16T13:55+00:00
 lcl/include/lcl_defines.inc 2020-07-11T19:46+00:00

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