summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-05-11 21:42:39 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-05-11 21:43:19 +0100
commitf2827fb15f530e002d722780be26caf326a45646 (patch)
treebf77a523c57830293f598c0a79ff0544c68a3d4f
parent3f6d3a4045507d1496709c5cff8f359a0d0e8b29 (diff)
debug foo for mingw32 build
Change-Id: I1d5f9940c6f85269373ccbdc9caa6c5696996c9f
-rw-r--r--configure.in14
-rw-r--r--i18npool/CustomTarget_breakiterator.mk16
2 files changed, 30 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index e3943eb78122..1d84260c0a15 100644
--- a/configure.in
+++ b/configure.in
@@ -7734,6 +7734,16 @@ if test "$with_system_icu" = "yes"; then
You can use --with-system-icu-for-build=force to use it anyway.])
fi
fi
+ if test "$ICU_MAJOR_FOR_BUILD" -ge "5" -o "$ICU_MAJOR_FOR_BUILD" = "4" -a "$ICU_MINOR_FOR_BUILD" -ge "4"; then
+ ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
+ else
+ ICU_RECLASSIFIED_CLOSE_PARENTHESIS="NO"
+ fi
+ if test "$ICU_MAJOR_FOR_BUILD" -ge "5" -o "$ICU_MAJOR_FOR_BUILD" = "4" -a "$ICU_MINOR_FOR_BUILD" -ge "9"; then
+ ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
+ else
+ ICU_RECLASSIFIED_PREPEND_SET_EMPTY="NO"
+ fi
fi
if test "$cross_compiling" != "yes" -o "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force"; then
@@ -7753,9 +7763,13 @@ You can use --with-system-icu-for-build=force to use it anyway.])
fi
if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4"; then
ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
+ else
+ ICU_RECLASSIFIED_CLOSE_PARENTHESIS="NO"
fi
if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "9"; then
ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
+ else
+ ICU_RECLASSIFIED_PREPEND_SET_EMPTY="NO"
fi
fi
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index 1c701847b409..e8253b949a5e 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -102,12 +102,28 @@ $(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(i18npool_GENBRKTARGET)
# NOTE: strips every line with _word_ 'Prepend', including $Prepend
$(i18npool_BIDIR)/%.txt : \
$(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir
+ifeq ($(GUI)$(COM),WNTGCC)
+ echo DEBUG i18npool ICU_RECLASSIFIED_CLOSE_PARENTHESIS=$(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
+ echo DEBUG i18npool ICU_RECLASSIFIED_PREPEND_SET_EMPTY=$(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
+ cat $(SRC_ROOT)/config_host.mk
+ cat $(SRC_ROOT)/config.log
+ cat $(SRC_ROOT)/configure
+endif
ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES)
ifeq ($(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),YES)
+ifeq ($(GUI)$(COM),WNTGCC)
+ echo DEBUG both
+endif
sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< | sed "/Prepend/d" > $@
else
+ifeq ($(GUI)$(COM),WNTGCC)
+ echo DEBUG only one
+endif
sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
endif
+ifeq ($(GUI)$(COM),WNTGCC)
+ cat $@
+endif
else
cp $< $@
endif