[Libreoffice-commits] core.git: 2 commits - distro-configs/LibreOfficeiOS.conf solenv/gbuild

[Tor Lillqvist]

 distro-configs/LibreOfficeiOS.conf |    1 +
 solenv/gbuild/LinkTarget.mk        |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 704be0f489d04fe9ea4251699f381e8ccadb63ca
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Apr 24 19:42:07 2013 +0300

    Prevent gb_Helper_PHONY from leaking into the shell
    
    Change-Id: Ifec0ea4dd06c9c06a796f293f0fc0973296fed60

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 9151444..35896fe 100755
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -114,7 +114,7 @@ endef
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_Object__command_dep
 mkdir -p $(dir $(1)) && \
-	echo "$(2) : $$(gb_Helper_PHONY)" > $(1)
+	echo "$(2) : $(gb_Helper_PHONY)" > $(1)
 
 endef
 else
commit 30b680477b11ccf993a59c8f81fa5ee2166e4eb5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Apr 24 19:24:35 2013 +0300

    Add --disable-neon
    
    Change-Id: Icf9d75e699e8a430ce0d2a305e1b696d8023466b

diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index ef1940f..695dd83 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -9,6 +9,7 @@
 --disable-gstreamer
 --disable-lockdown
 --disable-lotuswordpro
+--disable-neon
 --disable-odk
 --disable-opengl
 --disable-postgresql-sdbc