[Libreoffice-commits] core.git: 3 commits - configure.ac RepositoryModule_build.mk vcl/Library_vcl.mk

[Tor Lillqvist]

 RepositoryModule_build.mk |    7 +++++++
 configure.ac              |    2 +-
 vcl/Library_vcl.mk        |    2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 5adc0674a7e3edaeeedf639f9ae0e36cf5cced43
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jan 16 23:35:01 2014 +0200

    Export CROSS_COMPILING=YES, if set, while running the configure script
    
    It can thus be used in a pkg-config replacement wrapper that makes pkg-config
    look in an appropriate place, which typically is needed when not using a
    proper cross-compilation toolchain. (Such would come with an own copy of
    pkg-config.)
    
    Change-Id: I4c746206cc67ed7a428833f03b9d3aad250d31e1

diff --git a/configure.ac b/configure.ac
index bcd2fe7..24d7ce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3235,7 +3235,7 @@ AC_SUBST(DISABLE_ACTIVEX)
 AC_SUBST(DISABLE_ATL)
 
 if test "$cross_compiling" = "yes"; then
-    CROSS_COMPILING=YES
+    export CROSS_COMPILING=YES
     SCPDEFS="$SCPDEFS -DCROSS_COMPILING"
 else
     CROSS_COMPILING=
commit ad478d812f3c29336815ba8b914142f2e0783304
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jan 16 22:15:37 2014 +0200

    Need more modules when cross-compiling to a desktop platform
    
    Because gengal.
    
    Change-Id: I679177b8bade42787dc921a500679c53278029d1

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 74dcba4..981db44 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -62,18 +62,25 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 			basic \
 			canvas \
 			configmgr \
+			connectivity \
 			cppcanvas \
 			drawinglayer \
 			editeng \
+			extensions \
+			filter \
 			framework \
 			linguistic \
+			mysqlc \
+			officecfg \
 			package \
+			postprocess \
 			sfx2 \
 			sot \
 			svgio \
 			svl \
 			svtools \
 			svx \
+			swext \
 			toolkit \
 			ucb \
 			unoxml \
commit cbc0ad34d8d6f05800609979bb51cad087b79a10
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jan 16 21:43:34 2014 +0200

    If this is Windows specific, it can be inside ifeq ($(OS),WNT)
    
    This also prevents a weird problem I see when cross-compiling in one tree (but
    not in other trees for other cross-compilation targets).
    
    Change-Id: I102e652c259a66ea124b344bd229e8988801ac58

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9660161..cbbae6a 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -661,8 +661,10 @@ endif
 # Runtime dependency for unit-tests
 $(eval $(call gb_Library_use_restarget,vcl,vcl))
 
+ifeq ($(OS),WNT)
 # HACK: dependency on icon themes so running unit tests don't
 # prevent delivering these by having open file handles on WNT
 $(eval $(call gb_Library_use_package,vcl,postprocess_images))
+endif
 
 # vim: set noet sw=4 ts=4: