[Libreoffice-commits] online.git: configure.ac
Katarina Behrens
Katarina.Behrens at cib.de
Mon Apr 17 00:06:16 UTC 2017
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 8927eaf0571bc8a178c0e4d820160cb1dc7b40ab
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Thu Apr 13 22:39:37 2017 +0200
Strip trailing '/' from LO_PATH, if there's any
symlink() with path/with/trailing/slash/ and thus creating chroot
fails with ENOENT in totally opaque way
Change-Id: I5cd5213d8b6bfc50ea11cf8586b2a7b7f334631d
Reviewed-on: https://gerrit.libreoffice.org/36536
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/configure.ac b/configure.ac
index 74d56bd9..1a9e16a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,7 +172,8 @@ SYSTEMPLATE_PATH=not-set
have_lo_path=false
AC_MSG_CHECKING([whether to run tests against a LibreOffice])
if test -n "$with_lo_path"; then
- LO_PATH="$with_lo_path"
+ # strip trailing '/' from LO_PATH, 'ln -s' with such path will otherwise fail
+ LO_PATH="${with_lo_path%/}"
version_file="$with_lo_path/program/versionrc"
if test -f $version_file; then
JAILS_PATH="\${abs_top_builddir}/jails"
More information about the Libreoffice-commits
mailing list