Module_cross_tail_build.mk | 4 +++- cross_tail_build/Makefile | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 9fd956a23005ee019eb33816f250f4eb7bd73099 Author: Tor Lillqvist <[email protected]> Date: Mon Feb 18 15:08:32 2013 +0200 Need cppunit and expat apparently Change-Id: Ie32650d9c5752a9710732194b513631594030803 diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index fb10e70..046ee61 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ cosv \ cppu \ cppuhelper \ + cppunit \ i18npool \ i18nutil \ idl \ @@ -78,6 +79,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ helpcompiler \ xmlhelp \ ) \ + $(call gb_Helper_optional,EXPAT,expat) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ $(call gb_Helper_optional,UCPP,ucpp) \ commit 8ae2e9a8fefa1e6a6aed26f9d7c3c303fdd4dadc Author: Tor Lillqvist <[email protected]> Date: Mon Feb 18 14:49:14 2013 +0200 Include config_build.mk unconditionally I hope this will unbreak cross-compilation after 162a4f8d01210bed52f348b74e076ff245c33309. Otherwise I see stuff being built for the BUILD platform with the HOST compiler. Change-Id: I4f34a29bb1bfd9345610255bf5bb917a87c8c6f2 diff --git a/cross_tail_build/Makefile b/cross_tail_build/Makefile index e632a08..5fda0ec 100644 --- a/cross_tail_build/Makefile +++ b/cross_tail_build/Makefile @@ -26,9 +26,7 @@ # #************************************************************************* -ifeq ($(strip $(SOLARENV)),) include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_build.mk -endif export gb_Side=build commit aca7acbb00d8820848991df2ca38e23ef546b1c0 Author: Tor Lillqvist <[email protected]> Date: Mon Feb 18 14:48:50 2013 +0200 I think that l10ntools is needed unconditionally Change-Id: I4d11732d6b83388f07134008bcad33c541de401e diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index f2f1e58..fb10e70 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ jurt \ jvmaccess \ jvmfwk \ + l10ntools \ o3tl \ offapi \ officecfg \ @@ -75,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ $(call gb_Helper_optional,CLUCENE,clucene) \ $(call gb_Helper_optional_for_host,DESKTOP, \ helpcompiler \ - l10ntools \ xmlhelp \ ) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
