summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2022-03-02 09:49:51 +0100
committerAndras Timar <andras.timar@collabora.com>2022-04-03 16:47:36 +0200
commit805affb386c1c3e0b7ea6fe9672a514aca667a17 (patch)
treee276883db1428071b3e024c221d34bfc6dd098eb
parent73d16f3907678594091ce2439d2f600c17715ab0 (diff)
Do not pull in X11 dependencies when the build is configured for LOKitdistro/collabora/cp-6.2
Change-Id: I44a1782cf523bbfbbbb0e0d5333364f36c7ed495 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130780 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--instsetoo_native/inc_openoffice/unix/find-requires-x11.sh4
1 files changed, 3 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..6808b3631d73 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
@@ -23,5 +23,7 @@ if [[ "${OS}" == "AIX" ]]; then
echo "libfreetype.a(libfreetype.so.6${mark64})"
else
echo "libfreetype.so.6${mark64}"
- echo "libXinerama.so.1${mark64}"
+ if [[ "${XINERAMA_LINK}" == "dynamic" ]]; then
+ echo "libXinerama.so.1${mark64}"
+ fi
fi