From b3e45003e210ba08fea19ded83d4298beb9eac5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 12 May 2016 22:15:33 +0200 Subject: [PATCH] libreoffic: fix last minute bug + enable i686 Enable i686 for a try. If it fails, disable again. --- srcpkgs/libreoffice/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index fc13a18a888..f28a73d3329 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -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' }