diff options
| author | Christoph Willing <chris.willing@iinet.net.au> | 2017-02-15 13:01:34 +1000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-02-18 07:54:40 +0700 |
| commit | b621ff6cd78034f6423ff3062af8e351a0a97966 (patch) | |
| tree | 54eb6a18f95235b4e3912f4fd01b7a50e88ba93d /office/LibreOffice/LibreOffice.SlackBuild | |
| parent | bc56dbdd7001c81d56e29b32e7276903f81b65cd (diff) | |
office/LibreOffice: Upstream patch for firebird build race
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
Diffstat (limited to 'office/LibreOffice/LibreOffice.SlackBuild')
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index 12c844e69a84b..b7c6dfd13785e 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=LibreOffice SRCNAM=libreoffice VERSION=${VERSION:-5.3.0.3} SHORT_VERSION=${VERSION%.*.*} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PACKAGER=${PACKAGER:-"AnonymousCoward"} @@ -69,6 +69,8 @@ cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.xz cd $SRCNAM-$VERSION +patch -p0 < $CWD/no-check-if-root.diff +patch -p1 < $CWD/firebird.diff if [ "$HAVE_SRCS_TARBALL" = "1" ]; then tar xvf $CWD/$SRCNAM-${VERSION}-srcs.tar.xz @@ -153,7 +155,7 @@ if [ "$HAVE_SRCS_TARBALL" = "0" ]; then fi export LDFLAGS="-lboost_system" -make -i build-nocheck +make build-nocheck make distro-pack-install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ |