From 45acae0219a6fa6e658caf0fc206d1cbdf19518f Mon Sep 17 00:00:00 2001 From: Carsten Schoenert Date: Sun, 27 Aug 2017 21:14:01 +0200 Subject: [PATCH] use icudt??{b,l}.dat depending on architecture Upstream doesn't really care about big endian platforms and so also don't care about a needed file icudt??b.dat on big endian platforms. Changing the m4 macro for ICU so the needed file will be depended on the build platform exported and let later the configure run automatically use the correct name for the ICU *.dat file so we not only depend on the prebuild *.dat file for little endian. The `case foo in ...` loop could be obviously more compressed with only one case entry for all architectures which are all big endian. ---%<--- case $host in dnl big endian architectures hppa-*|m68k-*|...) --->%--- For more readability the more exclusive extra list of all possible architectures with big endianness in Debian was choosen. Gbp-Pq: Topic debian-hacks Gbp-Pq: Name use-icudt-b-l-.dat-depending-on-architecture.patch --- build/autoconf/icu.m4 | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 index 6afa262b07..8040193114 100644 --- a/build/autoconf/icu.m4 +++ b/build/autoconf/icu.m4 @@ -78,7 +78,33 @@ if test -n "$USE_ICU"; then # TODO: the l is actually endian-dependent # We could make this set as 'l' or 'b' for little or big, respectively, # but we'd need to check in a big-endian version of the file. - ICU_DATA_FILE="icudt${version}l.dat" + case $host in + dnl big endian architectures + hppa-*) + ICU_DATA_FILE="icudt${version}b.dat" + ;; + m68k-*) + ICU_DATA_FILE="icudt${version}b.dat" + ;; + mips-*) + ICU_DATA_FILE="icudt${version}b.dat" + ;; + powerpc-* | powerpc64-*) + ICU_DATA_FILE="icudt${version}b.dat" + ;; + s390*-*) + ICU_DATA_FILE="icudt${version}b.dat" + ;; + sparc*-*) + ICU_DATA_FILE="icudt${version}b.dat" + ;; + dnl assume little endian by default + *) + ICU_DATA_FILE="icudt${version}l.dat" + ;; + esac + + MOZ_ICU_DATA_ARCHIVE= fi AC_SUBST(MOZ_ICU_VERSION) -- 2.30.2