[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk solenv/bin

[Tor Lillqvist]

 RepositoryExternal.mk    |    3 ---
 solenv/bin/concat-deps.c |    6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 1133c65555568d17d9f9a2e4bf2054d89d77b065
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Sep 23 20:23:33 2013 +0300

    Make the Android cross-compilation get a bit further along
    
    Change-Id: Idf91e95afad9b89e39d7234622f4a37f18b5ca6c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b036b66..0756b41 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1634,9 +1634,6 @@ $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	lcms2 \
-)
 
 endef
 
commit c03124eb1cd2f9c1624978edcf2c4b04cd2f87f0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Sep 23 19:25:48 2013 +0300

    Print a helpful error message if we are going to fail
    
    Change-Id: I0685c9d2d857a9e994c616acb6d7ce106c7a7dad

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index ebabdd0..87b6f32 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -871,7 +871,11 @@ static inline int generate_phony_file(char* fn, char* content)
 {
 FILE* depfile;
     depfile = fopen(fn, "w");
-    if(depfile)
+    if(!depfile)
+    {
+        fprintf(stderr, "Could not open '%s' for writing: %s\n", fn, strerror(errno));
+    }
+    else
     {
         fputs(content, depfile);
         fclose(depfile);