[Libreoffice-commits] .: 2 commits - configure.in set_soenv.in solenv/gbuild

[Tor Lillqvist]

 configure.in                  |    4 +++-
 set_soenv.in                  |    2 ++
 solenv/gbuild/gbuild.mk       |    2 +-
 solenv/gbuild/platform/ios.mk |    4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit b73be443316fafd3eb2a13bb4155374be8180c54
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 14 01:04:16 2011 +0300

    Make static libraries on iOS

diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 0b26612..f7650e2 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -272,9 +272,9 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 
 define gb_LinkTarget__command
-$(call gb_Output_announce,$(2),$(true),LNK,4)
+$(call gb_Output_announce,$(2),$(true),LIB,4)
 $(if $(filter Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
-$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
+$(if $(filter Library StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
 endef
 
 
commit a71189680827805ff14ded1ce97f2415ad569320
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 14 00:53:34 2011 +0300

    Add FOR_BUILD variant of SYSTEM_LIBXSLT and use it to decide which xsltproc to run

diff --git a/configure.in b/configure.in
index 9f79e57..6d600c8 100755
--- a/configure.in
+++ b/configure.in
@@ -1687,7 +1687,8 @@ if test "$cross_compiling" = "yes"; then
     test -f ./*Env.Set.sh 2>/dev/null || exit
     cp *Env.Set.sh ../Env.Build.sh
     . ./*Env.Set.sh
-    for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH; do
+    for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
+             SYSTEM_LIBXSLT; do
       VV='$'$V
       VV=`eval "echo $VV"`
       if test -n "$VV"; then
@@ -1728,6 +1729,7 @@ AC_SUBST(GXX_INCLUDE_PATH_FOR_BUILD)
 AC_SUBST(INPATH_FOR_BUILD)
 AC_SUBST(OUTPATH_FOR_BUILD)
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
+AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD)
 
 AC_SUBST(OUTDIR_FOR_BUILD)
 AC_SUBST(PATH_FOR_BUILD)
diff --git a/set_soenv.in b/set_soenv.in
index 2abc67b..ac810ca 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1767,6 +1767,7 @@ if ( '@CROSS_COMPILING@' eq 'YES' )
    ToFile( "INPATH_FOR_BUILD",  "@INPATH_FOR_BUILD@", "e" );
    ToFile( "OUTPATH_FOR_BUILD", "@OUTPATH_FOR_BUILD@", "e" );
    ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" );
+   ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT_FOR_BUILD@", "e" );
    ToFile( "OUTDIR_FOR_BUILD",  "@OUTDIR_FOR_BUILD@", "e");
    ToFile( "SOLARINC_FOR_BUILD", "@SOLARINC_FOR_BUILD@", "e");
    ToFile( "SOLARLIB_FOR_BUILD", "@SOLARLIB_FOR_BUILD@", "e");
@@ -1785,6 +1786,7 @@ else
    ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
    ToFile( "INPATH_FOR_BUILD",  $INPATH,         "e" );
    ToFile( "OUTPATH_FOR_BUILD", $OUTPATH,        "e" );
+   ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT@", "e" );
    ToFile( "OUTDIR_FOR_BUILD",  $OUTDIR,         "e" );
    ToFile( "PATH_FOR_BUILD",    $PATH,           "e" );
    ToFile( "SOLARINC_FOR_BUILD", $SOLARINC,      "e" );
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 03c8f37..54bd791 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -297,7 +297,7 @@ endif
 endef
 
 
-ifeq ($(SYSTEM_LIBXSLT),YES)
+ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES)
 gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else