From 6e5ce600aa86e4d44981b1fc7d992fa3edfc2177 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Tue, 17 Apr 2018 17:18:21 +0200
Subject: [PATCH] PKG: fix the rpath on Qt plugins
---
Packaging/Files/linux_pkgsetup.in | 2 +-
Packaging/Files/macx_pkgsetup.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Packaging/Files/linux_pkgsetup.in b/Packaging/Files/linux_pkgsetup.in
index 93d5a6a082..cb99a4303c 100644
--- a/Packaging/Files/linux_pkgsetup.in
+++ b/Packaging/Files/linux_pkgsetup.in
@@ -52,7 +52,7 @@ fi
unset LD_LIBRARY_PATH
# we remove files in $OUT_DIR/lib/gtk which we CANNOT add new rpath
-BINARY_FILES=$(find "$OUT_DIR/lib" "$OUT_DIR/bin" -type f -exec file {} \; | grep -v '/lib/gtk/' | grep -i elf|cut -f1 -d':')
+BINARY_FILES=$(find "$OUT_DIR/lib" "$OUT_DIR/bin" "$OUT_DIR/plugins" -type f -exec file {} \; | grep -v '/lib/gtk/' | grep -i elf|cut -f1 -d':')
# run patchelf
for bin_file in $BINARY_FILES; do
#echo "adding rpath to $bin_file"
diff --git a/Packaging/Files/macx_pkgsetup.in b/Packaging/Files/macx_pkgsetup.in
index 7c4b5c8e94..022cbed84c 100755
--- a/Packaging/Files/macx_pkgsetup.in
+++ b/Packaging/Files/macx_pkgsetup.in
@@ -51,7 +51,7 @@ unset DYLD_FALLBACK_LIBRARY_PATH
echo "Configuring..."
-LIB_FILES=$(find "$OUT_DIR/lib" -type f -exec file {} \; | grep -i "Mach-O"|cut -d ':' -f1)
+LIB_FILES=$(find "$OUT_DIR/lib" "$OUT_DIR/plugins" -type f -exec file {} \; | grep -i "Mach-O"|cut -d ':' -f1)
BIN_FILES=$(find "$OUT_DIR/bin" -type f -exec file {} \; | grep -i "Mach-O*.*executable"|cut -d ':' -f1)
# run install_name_tool
for input_file in $LIB_FILES $BIN_FILES; do
--
GitLab