Note: This is a public test instance of Red Hat Bugzilla. The data contained within is a snapshot of the live data so any changes you make will not be reflected in the production Bugzilla. Email is disabled so feel free to test any aspect of the site that you want. File any problems you find or give feedback at bugzilla.redhat.com.

Bug 1969393

Summary: Build fail under s390x
Product: [Fedora] Fedora Reporter: Philippe Makowski <makowski.fedora>
Component: firebirdAssignee: Philippe Makowski <makowski.fedora>
Status: NEW --- QA Contact: Fedora Extras Quality Assurance <extras-qa>
Severity: unspecified Docs Contact:
Priority: unspecified    
Version: rawhideCC: caolanm, dan, fedora, i, makowski.fedora
Target Milestone: ---   
Target Release: ---   
Hardware: Unspecified   
OS: Unspecified   
Whiteboard:
Fixed In Version: Doc Type: If docs needed, set a value
Doc Text:
Story Points: ---
Clone Of: Environment:
Last Closed: Type: Bug
Regression: --- Mount Type: ---
Documentation: --- CRM:
Verified Versions: Category: ---
oVirt Team: --- RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: --- Target Upstream Version:
Embargoed:
Bug Depends On:    
Bug Blocks: 467765, 485231    

Description Philippe Makowski 2021-06-08 10:51:17 UTC
New upstream 4.0.0.2496
build fail under s390x

Comment 1 Dan Horák 2021-06-08 11:50:07 UTC
Could you provide some details next time, please?

Comment 2 Dan Horák 2021-06-08 12:31:24 UTC
the following changes fixed the build for me

diff -up Firebird-4.0.0.2496-0/src/jrd/sort.cpp.orig Firebird-4.0.0.2496-0/src/jrd/sort.cpp
--- Firebird-4.0.0.2496-0/src/jrd/sort.cpp.orig	2021-05-29 15:05:06.000000000 +0000
+++ Firebird-4.0.0.2496-0/src/jrd/sort.cpp	2021-06-08 12:28:57.829688875 +0000
@@ -713,6 +713,7 @@ void Sort::diddleKey(UCHAR* record, bool
 	for (sort_key_def* key = m_description.begin(), *end = m_description.end(); key < end; key++)
 	{
 		UCHAR* p = record + key->getSkdOffset();
+		SORTP* lwp = (SORTP*) p;
 		USHORT n = key->getSkdLength();
 		USHORT complement = key->skd_flags & SKD_descending;
 
diff -up Firebird-4.0.0.2496-0/src/jrd/sort.h.orig Firebird-4.0.0.2496-0/src/jrd/sort.h
--- Firebird-4.0.0.2496-0/src/jrd/sort.h.orig	2021-05-29 15:05:06.000000000 +0000
+++ Firebird-4.0.0.2496-0/src/jrd/sort.h	2021-06-08 12:29:02.179688875 +0000
@@ -27,6 +27,7 @@
 #include "../include/fb_blk.h"
 #include "../common/DecFloat.h"
 #include "../jrd/TempSpace.h"
+#include "../jrd/align.h"
 
 namespace Jrd {

Comment 3 Dan Horák 2021-06-08 12:45:28 UTC
but there is still an issue in the employee test ...

Comment 4 Caolan McNamara 2021-06-11 08:36:37 UTC
could we build for s390x with the buildfix in place and disable the tests temporarily for that arch so firebird dependencies (like libreoffice) can be built in the meantime ?

Comment 5 Dan Horák 2021-06-11 09:17:26 UTC
Let me open an upstream PR with the fixes. The employee example is built during the "build" phase, but I think we could circumvent the failure I believe.

Comment 6 Dan Horák 2021-06-11 09:36:59 UTC
opened https://github.com/FirebirdSQL/firebird/pull/6852

Comment 7 Dan Horák 2021-06-11 10:10:15 UTC
for the record, this is the list of affected packages

[dan@talos ~]$ sudo dnf --repoid=rawhide-source --arch=src repoquery --whatrequires firebird-devel                                                                                            

flamerobin-0:0.9.3.1-16.fc34.src
hydra-0:9.2-2.fc35.src
libreoffice-1:7.1.3.2-4.fc35.src
opendbx-0:1.4.6-26.fc34.src
php-0:8.0.7-1.fc35.src
python-fdb-0:2.0.1-2.fc34.src
qt-1:4.8.7-60.fc35.src
qt5-qtbase-0:5.15.2-18.fc35.src

Comment 8 Remi Collet 2021-06-15 14:32:41 UTC
For memory, usage temporarily disabled for new PHP build.

Please ping me to re-enable when fixed