PR#19: Align aarch64 to x86_64 - rpms/libreoffice

rpms / libreoffice

#19 Align aarch64 to x86_64

Merged 10 months ago by limb. Opened 10 months ago by mattia.

rpms/ mattia/libreoffice rawhide into rawhide

Link aarch64 executable with standard -g level

Mattia Verga • 10 months ago

8240bfa

Remove test exclusions for aarch64

Mattia Verga • 10 months ago

256e9ad

0001-aarch64-failing-here.patch

file removed

-33

		`@@ -1,33 +0,0 @@`
		`- From 52792b066bc98ae2a0813f5713756aff47a17910 Mon Sep 17 00:00:00 2001`
		`- From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>`
		`- Date: Thu, 19 Jan 2023 19:50:35 +0000`
		`- Subject: [PATCH] aarch64 failing here`
		`-`
		`- Change-Id: I5f9b28814424cb3c490308875182ea675ec73866`
		`- ---`
		`- sw/qa/extras/htmlimport/htmlimport.cxx \| 2 ++`
		`- 1 file changed, 2 insertions(+)`
		`-`
		`- diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx`
		`- index c97d4e4cbde4..7ff74bd32d02 100644`
		`- --- a/sw/qa/extras/htmlimport/htmlimport.cxx`
		`- +++ b/sw/qa/extras/htmlimport/htmlimport.cxx`
		`- @@ -299,6 +299,7 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px)`
		`- CPPUNIT_ASSERT_MESSAGE("Missing cell right border", aBorder.InnerLineWidth > 0);`
		`- }`
		`-`
		`- +#if 0`
		`- CPPUNIT_TEST_FIXTURE(HtmlImportTest, testOutlineLevel)`
		`- {`
		`- createSwWebDoc("outline-level.html");`
		`- @@ -307,6 +308,7 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testOutlineLevel)`
		`- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1),`
		`- getProperty<sal_Int32>(getParagraph(1), "OutlineLevel"));`
		`- }`
		`- +#endif`
		`-`
		`- CPPUNIT_TEST_FIXTURE(HtmlImportTest, testReqIfBr)`
		`- {`
		`- --`
		`- 2.39.0`
		`-`

libreoffice.spec

file modified

+7 -6

		`@@ -58,7 +58,7 @@`
		`Name: libreoffice`
		`Epoch: 1`
		`Version: %{libo_version}.3`
		`- Release: 3%{?libo_prerelease}%{?dist}`
		`+ Release: 4%{?libo_prerelease}%{?dist}`
		`# default new files are: MPLv2`
		`# older files are typically: MPLv2 incorporating work under ASLv2`
		`# nlpsolver is: LGPLv3`
		`@@ -270,8 +270,6 @@`
		`# backported`
		`Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch`
		`Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch`
		`- # TODO investigate these`
		`- Patch5: 0001-aarch64-failing-here.patch`
		`# backported`
		`Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch`
		`Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch`
		`@@ -1027,8 +1025,7 @@`
		`sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk`
		`%endif`
		`%ifarch aarch64`
		`- sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk`
		`- sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk`
		`+ # Nothing to do`
		`%endif`
		`%ifarch s390x`
		`sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk`
		`@@ -1057,7 +1054,7 @@`
		`esac`
		`ARCH_FLAGS="$ARCH_FLAGS $i"`
		`done`
		`- %ifarch s390 s390x %{arm} aarch64`
		`+ %ifarch s390 s390x %{arm}`
		`# these builders typically do not have enough memory to link the big libs with -g2`
		`ARCH_FLAGS="$ARCH_FLAGS -g1"`
		`%endif`
		`@@ -2261,6 +2258,10 @@`
		`%{_includedir}/LibreOfficeKit`

		`%changelog`
		`+ * Sun Aug 27 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-4`
		`+ - Remove test exclusions from aarch64`
		`+ - Link aarch64 executable with standard -g level`
		`+`
		`* Wed Aug 23 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-3`
		`- Disable other failing tests under s390x`
		`- Add patch to fix FTB under ppc64le`

mattia commented 10 months ago

All tests are now passing on aarch64, no need to exclude some anymore.
Also, seems there's no need to force -g1 on aarch64. But let's monitor for any weird build failures.