libreoffic: fix last minute bug + enable i686

Enable i686 for a try. If it fails, disable again.
This commit is contained in:
Jürgen Buchmüller 2016-05-12 22:15:33 +02:00
parent 517f3c4acb
commit b3e45003e2
1 changed files with 7 additions and 7 deletions

View File

@ -47,11 +47,11 @@ skip_extraction="
${pkgname}-help-${version}.tar.xz
${pkgname}-translations-${version}.tar.xz"
case "$XBPS_TARGET_MACHINE" in
i686*) # Unit tests failure - unknown reason
broken="http://build.voidlinux.eu/builders/i686_builder/builds/22276/steps/shell_3/logs/stdio"
;;
esac
#case "$XBPS_TARGET_MACHINE" in
# i686*) # Unit tests failure - unknown reason
# broken="http://build.voidlinux.eu/builders/i686_builder/builds/22276/steps/shell_3/logs/stdio"
# ;;
#esac
if [ -z "$CROSS_BUILD" ]; then
# mariadbclient can't currently be cross compiled
@ -165,10 +165,10 @@ do_configure() {
configure_args+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"
configure_args+=" --with-parallelism=${XBPS_MAKEJOBS}"
OPENCOLLADA_CFLAGS="-I${incdir}/opencollada/COLLADABaseUtils -I${incdir}/opencollada/COLLADAFramework -I${incdir}/opencollada/COLLADASaxFrameworkLoader -I${incdir}/opencollada/COLLADAStreamWriter -I${incdir}/opencollada/GeneratedSaxParser" \
OPENCOLLADA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lGeneratedSaxParser -lMathMLSolver -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lOpenCOLLADAStreamWriter -lUTF -lbuffer -lftoa" \
# In theory we could use --with-lang=ALL but then
# building the package then takes ages.
OPENCOLLADA_CFLAGS="-I${incdir}/opencollada/COLLADABaseUtils -I${incdir}/opencollada/COLLADAFramework -I${incdir}/opencollada/COLLADASaxFrameworkLoader -I${incdir}/opencollada/COLLADAStreamWriter -I${incdir}/opencollada/GeneratedSaxParser" \
OPENCOLLADA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lGeneratedSaxParser -lMathMLSolver -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lOpenCOLLADAStreamWriter -lUTF -lbuffer -lftoa" \
./configure ${configure_args} --with-lang='en-US de es fr it pl pt'
}