loolwsd/loolwsd-systemplate-setup | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ce3dc628be89e4c588b2e2bf136166e375855567
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Feb 12 13:26:19 2016 +0200
Fix misleading comment
diff --git a/loolwsd/loolwsd-systemplate-setup
b/loolwsd/loolwsd-systemplate-setup
index b8c5631..97da6ad 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -56,9 +56,8 @@ while read file; do
done |
grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)' | sort -u | sed -e
's,^/,,'
-# Go through the loolkit
+# Poco libraries and their dependencies
find $POCODIR -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*'
-
find $POCODIR /usr/lib64 -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*' |
while read file; do
echo $file
commit 39bfd5a2101a992ac1204a10b3d19e7822089b1b
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Feb 12 13:23:41 2016 +0200
Look for self-copmpiled Poco also in /opt/poco
That's where I have it...
Also, make sure such self-built Poco libraries themselves get copied
into the systemplate.
diff --git a/loolwsd/loolwsd-systemplate-setup
b/loolwsd/loolwsd-systemplate-setup
index f8da121..b8c5631 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -6,7 +6,7 @@ test $# -eq 2 || { echo "Usage: $0 <chroot template directory
for system libs to
CHROOT=$1
INSTDIR=$2
-POCODIR=/usr/local/lib
+POCODIR="/usr/local/lib /opt/poco/lib"
test -d "$INSTDIR" || { echo "No such directory: $INSTDIR"; exit 1; }
@@ -57,6 +57,8 @@ done |
grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)' | sort -u | sed -e
's,^/,,'
# Go through the loolkit
+find $POCODIR -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*'
+
find $POCODIR /usr/lib64 -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*' |
while read file; do
echo $file
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
