summaryrefslogtreecommitdiffstats
path: root/office/LibreOffice/LibreOffice.SlackBuild
diff options
context:
space:
mode:
author Christoph Willing2016-02-05 18:35:43 +0100
committer Willy Sudiarto Raharjo2016-02-05 21:36:46 +0100
commit235aeb87a8be538d5d9d31c6364266cbb8f1005e (patch)
treeddc177aed7a51ae4464dcf2e28a729d59cc52f17 /office/LibreOffice/LibreOffice.SlackBuild
parente4b2adda9d549323cfc7a1bbb6a29b4147189c87 (diff)
downloadslackbuilds-235aeb87a8be538d5d9d31c6364266cbb8f1005e.tar.gz
office/LibreOffice: Fix Build on x86.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'office/LibreOffice/LibreOffice.SlackBuild')
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild15
1 files changed, 12 insertions, 3 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index eef88c26b7..4e1fd0fa27 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -80,6 +80,10 @@ for aname in $SRCNAM-{dictionaries,help,translations}-$VERSION.tar.xz ; do
cp -p $CWD/$aname src/
fi
done
+# testTdf87924 fails on x?86
+if [ "$ARCH" != "x86_64" ]; then
+ patch -p0 < $CWD/010_testTdf87924.diff
+fi
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -87,11 +91,16 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Options
+avahi="" ; [ "${AVAHI:-yes}" != "no" ] && avahi="--enable-avahi"
+vlc="" ; [ "${VLC:-no}" != "no" ] && vlc="--enable-vlc"
+
# LibreOffice.info REQUIRES jdk
[ -z $JAVA_HOME ] && . /etc/profile.d/jdk.sh
./configure \
CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
NSS_CFLAGS="$(pkg-config --cflags-only-I mozilla-nss)"\
--prefix=/usr \
--mandir=/usr/man \
@@ -105,8 +114,9 @@ find -L . \
--enable-python="system" \
--enable-gio \
--enable-kde4 \
- --enable-avahi \
- --enable-vlc \
+ --enable-ext-mariadb-connector \
+ $avahi \
+ $vlc \
--with-x \
--with-tls="nss" \
--without-krb5 \
@@ -130,7 +140,6 @@ find -L . \
--with-system-libwpg \
--with-system-libxml \
--with-system-mariadb \
- --enable-ext-mariadb-connector \
--with-system-mesa-headers \
--with-system-neon \
--with-system-nss \