summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2022-03-25 08:37:37 +0100
committerCaolán McNamara <caolanm@redhat.com>2022-03-26 11:25:13 +0100
commit5f05b79821699456309a9b7434772cc3eb2dc64a (patch)
treee451d00cd2778ec106f98be0c36800ed6f575c5c
parentconfigure.ac: add missing MAC_OS_X_VERSION_MAX_ALLOWED for macOS SDK 12.3 (diff)
downloadcore-5f05b79821699456309a9b7434772cc3eb2dc64a.tar.gz
core-5f05b79821699456309a9b7434772cc3eb2dc64a.zip
Depend on 64-bit packages for aarch64 as well
As Christian Lohmaier pointed out in [1]: > When building packages using the epm method, the dependency gets added > by instsetoo_native/inc_openoffice/unix/find-requires-x11.sh - and it > looks like it should also add the ()(64bit) marker to the dependency > when PLATFORMID is linux_aarch64 and not only for linux_x86_64 > > check with rpm -q --provides libXinerama-1.1.3-2.1.el7.aarch64 whether > it provides "libXinerama.so.1()(64bit)" The reply of 2022-03-25T10:41 (public mailing list version probably still pending in some moderator queue) shows it does: > [root@1 rpm2]# `rpm -q --provides > > ^CbXinerama-1.1.3-2.1.el7.aarch64 > [root@1 rpm2]# rpm -q --provides libXinerama-1.1.3-2.1.el7.aarch64 > libXinerama = 1.1.3-2.1.el7 > libXinerama(aarch-64) = 1.1.3-2.1.el7 > libXinerama.so.1()(64bit) [1] https://lists.freedesktop.org/archives/libreoffice/2022-March/088637.html Change-Id: I1b9a4025399d82ac5f5e51ea5523417e3e6cf395 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132094 Tested-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit d6ea4b8ffce91d7956cea0267c95ca69e208db24) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132044 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--instsetoo_native/inc_openoffice/unix/find-requires-x11.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
index 0fe0b1d27dde..338b7919d4ed 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
@@ -18,7 +18,7 @@
#
cat > /dev/null
-[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)"
+[[ "${PLATFORMID}" == "linux_x86_64" || "${PLATFORMID}" == "linux_aarch64" ]] && mark64="()(64bit)"
if [[ "${OS}" == "AIX" ]]; then
echo "libfreetype.a(libfreetype.so.6${mark64})"
else