[Libreoffice-commits] core.git: 2 commits - libxslt/ExternalPackage_xslt.mk

[Tor Lillqvist]

 libxslt/ExternalPackage_xslt.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6cd3968702ade141869d93600ac12afe56591354
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Feb 5 22:25:59 2013 +0200

    No xsltproc needed for HOST when cross-compiling
    
    Change-Id: I70b257fb2df8e0ea1ef2d94b3da7da7989e3535e

diff --git a/libxslt/ExternalPackage_xslt.mk b/libxslt/ExternalPackage_xslt.mk
index d672095..a007171 100644
--- a/libxslt/ExternalPackage_xslt.mk
+++ b/libxslt/ExternalPackage_xslt.mk
@@ -24,7 +24,9 @@ $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltp
 else ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.a,libxslt/.libs/libxslt.a))
 $(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.a,libexslt/.libs/libexslt.a))
+ifneq ($(CROSS_COMPILING),YES)
 $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/xsltproc))
+endif
 else ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
 $(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.dll.a,libxslt/.libs/libxslt.dll.a))
commit f5fe1b97557cc71eda9ed754bb70ec730df366e3
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Feb 5 22:24:26 2013 +0200

    Correct location where xsltproc binary is in the DISABLE_DYNLOADING case
    
    Change-Id: I0c65076d698865a653cac774a17f9db3d6f4d9ca

diff --git a/libxslt/ExternalPackage_xslt.mk b/libxslt/ExternalPackage_xslt.mk
index 056de0a..d672095 100644
--- a/libxslt/ExternalPackage_xslt.mk
+++ b/libxslt/ExternalPackage_xslt.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltp
 else ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.a,libxslt/.libs/libxslt.a))
 $(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.a,libexslt/.libs/libexslt.a))
-$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc))
+$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/xsltproc))
 else ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
 $(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.dll.a,libxslt/.libs/libxslt.dll.a))