i18npool/source/localedata/Makefile | 8 ++------
solenv/gbuild/Helper.mk | 2 +-
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 +-
solenv/gbuild/platform/com_GCC_defs.mk | 2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit c240dbc820359cf924e2383b743c02e204945a4c
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu Dec 8 16:43:26 2011 +0100
Fix 18npool build on Windows.
diff --git a/i18npool/source/localedata/Makefile
b/i18npool/source/localedata/Makefile
index 618db65..da83ff4 100755
--- a/i18npool/source/localedata/Makefile
+++ b/i18npool/source/localedata/Makefile
@@ -40,15 +40,11 @@ localedata_%.cxx : localedata_%_invis.cxx
ifeq ($(OS_FOR_BUILD),WNT)
localedata_%_invis.cxx : $(realpath
$(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR)/bin/saxparser$(gb_Executable_EXT)
- $(call gb_Helper_execute,saxparser $* `cygpath -m $<` $@ \
- $(my_file)`cygpath -m
$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m
$(OUTDIR)/bin/types.rdb` \
- -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
+ $(call gb_Helper_execute,saxparser $* `cygpath -m $<` $@
$(my_file)`cygpath -m
$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m
$(OUTDIR)/bin/types.rdb` -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
else
localedata_%_invis.cxx : $(realpath
$(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build)
- $(call gb_Helper_execute,saxparser $* $< $@ \
-
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb
$(OUTDIR_FOR_BUILD)/bin/types.rdb \
- -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
+ $(call gb_Helper_execute,saxparser $* $< $@
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb
$(OUTDIR_FOR_BUILD)/bin/types.rdb
-env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
endif
saxparser.rdb : saxparser.input
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 881aed9..e27d2ee 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -165,7 +165,7 @@ gb_StaticLibrary_$(1) += $(2)
endef
define gb_Helper_execute
-$(call gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
+$(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
endef
# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker
need to use
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5f8fb1c..809d83c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE) && $(subst
$(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)))))))))
endef
-gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
+gb_Helper_set_ld_path := PATH=\"$${PATH}:$(OUTDIR)/bin\"
# convert parameters filesystem root to native notation
# does some real work only on windows, make sure not to
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 03ac2a8..c154a7a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -144,7 +144,7 @@ else
gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
endif
-gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib
+gb_Helper_set_ld_path :=
$(gb_Helper_LIBRARY_PATH_VAR)=\"$(OUTDIR_FOR_BUILD)/lib\"
# $(1): list of directory pathnames to append at the end of the ld path
define gb_Helper_extend_ld_path
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
