Date: Sunday, June 7, 2015 @ 13:12:46
Author: andyrtr
Revision: 240401
minor cleanups; make sure -s is stripped from Makeflags; disable avahi - solves
LibO-impress doesn't start when no avahi service running is found
Modified:
libreoffice-fresh/trunk/PKGBUILD
libreoffice-fresh/trunk/PKGBUILD.50
-------------+
PKGBUILD | 15 ++++-----------
PKGBUILD.50 | 16 +++++-----------
2 files changed, 9 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-06-07 11:03:14 UTC (rev 240400)
+++ PKGBUILD 2015-06-07 11:12:46 UTC (rev 240401)
@@ -176,19 +176,12 @@
build() {
cd libreoffice-$_LOver
- # i686 build broken in make CppunitTest_sw_ooxmlsdrexport
-# [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlsdrexport/d'
sw/Module_sw.mk
+ # strip -s from Makeflags in case you use it to shorten build logs
+ _MAKEFLAGS=${MAKEFLAGS/-s/}
-#return 1
- #autoconf -f
-
- # non-SMP test build
- #export MAKEFLAGS="-j1"
- #./configure --with-build-version="${_LOver} Arch Linux
build-${pkgrel}" --with-vendor="Arch Linux" \
-
./autogen.sh --with-build-version="${_LOver} Arch Linux
build-${pkgrel}" --with-vendor="Arch Linux" \
--enable-split-app-modules \
- --with-parallelism=${MAKEFLAGS/-j/} \
+ --with-parallelism=${_MAKEFLAGS/-j/} \
--with-external-tar="${srcdir}/ext_sources" \
--disable-fetch-external \
--disable-verbose \
@@ -197,7 +190,7 @@
--libdir=/usr/lib --mandir=/usr/share/man \
--with-lang="" \
--enable-crashdump \
- --enable-avahi \
+ --disable-avahi \
--enable-dbus \
--enable-evolution2\
--enable-gio\
Modified: PKGBUILD.50
===================================================================
--- PKGBUILD.50 2015-06-07 11:03:14 UTC (rev 240400)
+++ PKGBUILD.50 2015-06-07 11:12:46 UTC (rev 240401)
@@ -175,19 +175,13 @@
build() {
cd libreoffice-$_LOver
- # i686 build broken in make CppunitTest_sw_ooxmlsdrexport
-# [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlsdrexport/d'
sw/Module_sw.mk
-#return 1
- #autoconf -f
-
- # non-SMP test build
- #export MAKEFLAGS="-j1"
- #./configure --with-build-version="${_LOver} Arch Linux
build-${pkgrel}" --with-vendor="Arch Linux" \
-
+ # strip -s from Makeflags in case you use it to shorten build logs
+ _MAKEFLAGS=${MAKEFLAGS/-s/}
+
./autogen.sh --with-build-version="${_LOver} Arch Linux
build-${pkgrel}" --with-vendor="Arch Linux" \
--enable-split-app-modules \
- --with-parallelism=${MAKEFLAGS/-j/} \
+ --with-parallelism=${_MAKEFLAGS/-j/} \
--with-external-tar="${srcdir}/ext_sources" \
--disable-fetch-external \
--disable-verbose \
@@ -196,7 +190,7 @@
--libdir=/usr/lib --mandir=/usr/share/man \
--with-lang="" \
--enable-crashdump \
- --enable-avahi \
+ --disable-avahi \
--enable-dbus \
--enable-evolution2\
--enable-gio\
