[Libreoffice-commits] core.git: 3 commits - distro-configs/LibreOfficeEmscripten.conf

[Samuel Mehrbrodt]

 distro-configs/LibreOfficeEmscripten.conf |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit a44d9541c78e6b398c42e0b8d559665f5dec4e0d
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Oct 12 10:28:32 2015 +0200

    Emscripten: Seems we need cairo canvas
    
    Change-Id: Ib6a10305e0e1b92d7ccc0a4e4ad580d286cc166e

diff --git a/distro-configs/LibreOfficeEmscripten.conf b/distro-configs/LibreOfficeEmscripten.conf
index b6078a8..b90a090 100644
--- a/distro-configs/LibreOfficeEmscripten.conf
+++ b/distro-configs/LibreOfficeEmscripten.conf
@@ -4,7 +4,6 @@
 --build=x86_64-unknown-linux-gnu
 
 # Disable unnecessary stuff
---disable-cairo-canvas
 --disable-cups
 --disable-gconf
 --disable-dconf
@@ -41,6 +40,9 @@
 --with-system-zlib=no
 --with-system-nss=yes
 
+# Build fails when disabling these
+#--disable-cairo-canvas
+
 # This helps spotting build errors
 --with-parallelism=no
 
commit db4f28caa37d45ef21dc10c9eea1aadb0f8a6dc3
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Oct 12 09:47:08 2015 +0200

    Emscripten: Disable nss for now
    
    Change-Id: Ife976e777946e75510b96d64ad04e847b4a59141

diff --git a/distro-configs/LibreOfficeEmscripten.conf b/distro-configs/LibreOfficeEmscripten.conf
index 417733a..b6078a8 100644
--- a/distro-configs/LibreOfficeEmscripten.conf
+++ b/distro-configs/LibreOfficeEmscripten.conf
@@ -39,6 +39,7 @@
 --without-system-dicts
 --with-theme=no
 --with-system-zlib=no
+--with-system-nss=yes
 
 # This helps spotting build errors
 --with-parallelism=no
commit 79104cbaf76988d3880c84900a5515b8f86a6b66
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Oct 12 09:46:18 2015 +0200

    Emscripten: Enable debug output during build
    
    Change-Id: I7c65711a2bdf6616d31712b4b23305a5dead59f7

diff --git a/distro-configs/LibreOfficeEmscripten.conf b/distro-configs/LibreOfficeEmscripten.conf
index 2678b92..417733a 100644
--- a/distro-configs/LibreOfficeEmscripten.conf
+++ b/distro-configs/LibreOfficeEmscripten.conf
@@ -50,5 +50,5 @@
 #--disable-ccache
 
 # Specify Emscripten compiler
-CC=emcc
-CXX=emcc
+CC=emcc -v
+CXX=emcc -v