view patches/openoffice-i18npool-cross.patch @ 6512:ccc20ae889ca default tip guix

mingw::guile-2.0.7 builds.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Thu, 24 Mar 2016 08:03:39 +0100
parents 0fcf64ee698f
children
line wrap: on
line source

i18npool/source/textconversion/data/makefile.mk
--- i18npool/source/textconversion/data/makefile.mk.~1.7.~	2008-04-10 11:11:44.000000000 +0200
+++ i18npool/source/textconversion/data/makefile.mk	2008-10-28 16:48:36.000000000 +0100
@@ -64,9 +64,16 @@ LIB1OBJFILES=$(SHL1OBJS)
 .INCLUDE :  target.mk
 
 APP1TARGET = genconv_dict
+
+.IF "$(CROSS_COMPILING)" == "no"
+GENCONV_DICT = $(BIN)$/genconv_dict$(EXECPOST)
+.ELSE # "$(CROSS_COMPILING)" == "yes"
+GENCONV_DICT = $(OOO_TOOLS_DIR)/genconv_dict
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
 $(MISC)$/%.cxx : %.dic
-	$(BIN)$/genconv_dict $* $< $@
+	$(GENCONV_DICT) $* $< $@
 
 # ugly - is this dependency really required here?
-$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genconv_dict$(EXECPOST)
+$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(GENCONV_DICT)
 
i18npool/source/localedata/data/makefile.mk
--- i18npool/source/localedata/data/makefile.mk.~1.47.~	2008-04-10 11:06:09.000000000 +0200
+++ i18npool/source/localedata/data/makefile.mk	2008-10-28 16:45:45.000000000 +0100
@@ -486,7 +486,13 @@ DEPOBJFILES= \
 
 $(MY_MISC_CXXFILES) : $(BIN)$/saxparser$(EXECPOST)
 
+.IF "$(CROSS_COMPILING)" == "no"
+SAXPARSER = $(BIN)$/saxparser$(EXECPOST)
+.ELSE # "$(CROSS_COMPILING)" == "yes"
+SAXPARSER = $(OOO_TOOLS_DIR)/saxparser
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
 $(MISC)$/localedata_%.cxx : %.xml
-    $(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
+    $(WRAPCMD) $(SAXPARSER) $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
     $(RM) $(BIN)$/$(@:b).rdb
 
i18npool/source/collator/data/makefile.mk
--- i18npool/source/collator/data/makefile.mk.~1.7.~	2008-04-10 10:58:10.000000000 +0200
+++ i18npool/source/collator/data/makefile.mk	2008-10-28 16:42:36.000000000 +0100
@@ -60,9 +60,15 @@ SHL1OBJS=$(SLOFILES)
 # --- Targets ------------------------------------------------------
 .INCLUDE :  target.mk
 
+.IF "$(CROSS_COMPILING)" == "no"
+GENCOLL_RULE = $(BIN)$/gencoll_rule$(EXECPOST)
+.ELSE # "$(CROSS_COMPILING)" == "yes"
+GENCOLL_RULE = $(OOO_TOOLS_DIR)/gencoll_rule
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
 $(MISC)$/collator_%.cxx : %.txt
-    $(BIN)$/gencoll_rule $< $@ $*
+    $(GENCOLL_RULE) $< $@ $*
 
 # ugly - is this dependency really required here?
-$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gencoll_rule$(EXECPOST)
+$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/$(GENCOLL_RULE)
 
i18npool/source/indexentry/data/makefile.mk
--- i18npool/source/indexentry/data/makefile.mk.~1.7.~	2008-04-10 11:01:24.000000000 +0200
+++ i18npool/source/indexentry/data/makefile.mk	2008-10-28 16:44:07.000000000 +0100
@@ -63,9 +63,15 @@ LIB1OBJFILES=$(SHL1OBJS)
 # --- Targets ------------------------------------------------------
 .INCLUDE :  target.mk
 
+.IF "$(CROSS_COMPILING)" == "no"
+GENINDEX_DATA = $(BIN)$/genindex_data$(EXECPOST)
+.ELSE # "$(CROSS_COMPILING)" == "yes"
+GENINDEX_DATA = $(OOO_TOOLS_DIR)/genindex_data
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
 $(MISC)$/%.cxx : %.txt
-    $(BIN)$/genindex_data $< $@ $*
+    $(GENINDEX_DATA) $< $@ $*
 
 # ugly - is this dependency really required here?
-$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genindex_data$(EXECPOST)
+$(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/$(GENINDEX_DATA)
 
i18npool/source/breakiterator/data/makefile.mk
--- i18npool/source/breakiterator/data/makefile.mk.~1.9.~	2008-04-10 10:54:04.000000000 +0200
+++ i18npool/source/breakiterator/data/makefile.mk	2008-10-28 16:40:03.000000000 +0100
@@ -80,9 +80,15 @@ DEPOBJFILES= \
 # --- Targets ------------------------------------------------------
 .INCLUDE :  target.mk
 
+.IF "$(CROSS_COMPILING)" == "no"
+GENDICT = $(BIN)$/gendict$(EXECPOST)
+.ELSE # "$(CROSS_COMPILING)" == "yes"
+GENDICT = $(OOO_TOOLS_DIR)/gendict
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
 $(MISC)$/dict_%.cxx : %.dic
-	$(BIN)$/gendict $< $@
+	$(GENDICT) $< $@
 
 # ugly - is this dependency really required here?
-$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gendict$(EXECPOST)
+$(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(GENDICT)