CVS commit: pkgsrc/textproc/icu

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Thu May  7 16:01:34 UTC 2020

Modified Files:
        pkgsrc/textproc/icu: distinfo
        pkgsrc/textproc/icu/patches: patch-i18n_double-conversion-utils.h

Log Message:
icu: fix build error on sh3.  Also remove now duplicated part for ARMEB.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/textproc/icu/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/textproc/icu/patches/patch-i18n_double-conversion-utils.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/icu/distinfo
diff -u pkgsrc/textproc/icu/distinfo:1.88 pkgsrc/textproc/icu/distinfo:1.89
--- pkgsrc/textproc/icu/distinfo:1.88   Sun Apr 12 07:06:43 2020
+++ pkgsrc/textproc/icu/distinfo        Thu May  7 16:01:33 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.88 2020/04/12 07:06:43 adam Exp $
+$NetBSD: distinfo,v 1.89 2020/05/07 16:01:33 tsutsui Exp $
 
 SHA1 (icu4c-66_1-src.tgz) = 68e87ea2044e92a5d86be6072b0eb3557f252d9f
 RMD160 (icu4c-66_1-src.tgz) = 1bd67bd30b161681a5040244e58c4d87bbdce6ce
@@ -18,7 +18,7 @@ SHA1 (patch-config_mh-darwin) = 4fd2c664
 SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
 SHA1 (patch-configure) = 1f96ffb2c2c023b38a45326c0273be0ae9cc02ff
 SHA1 (patch-configure.ac) = 2cb4601e20ee6b93e08e8790df3f8212510aeb1b
-SHA1 (patch-i18n_double-conversion-utils.h) = 132e9878f0bd9d53f7a2c060529fd70b6040f2bb
+SHA1 (patch-i18n_double-conversion-utils.h) = 9bee115bb9ddc597607e30f95050de7b21751fca
 SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663
 SHA1 (patch-runConfigureICU) = 3cd60613104fa4f1b81529795e75d5cf7f477b64
 SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110

Index: pkgsrc/textproc/icu/patches/patch-i18n_double-conversion-utils.h
diff -u pkgsrc/textproc/icu/patches/patch-i18n_double-conversion-utils.h:1.5 pkgsrc/textproc/icu/patches/patch-i18n_double-conversion-utils.h:1.6
--- pkgsrc/textproc/icu/patches/patch-i18n_double-conversion-utils.h:1.5        Wed Jul 24 17:02:07 2019
+++ pkgsrc/textproc/icu/patches/patch-i18n_double-conversion-utils.h    Thu May  7 16:01:33 2020
@@ -1,15 +1,15 @@
-$NetBSD: patch-i18n_double-conversion-utils.h,v 1.5 2019/07/24 17:02:07 rin Exp $
+$NetBSD: patch-i18n_double-conversion-utils.h,v 1.6 2020/05/07 16:01:33 tsutsui Exp $
 
-Add support for ARMEB.
+Add support for sh3.
 
---- i18n/double-conversion-utils.h.orig        2019-07-24 21:04:19.876508903 +0900
-+++ i18n/double-conversion-utils.h     2019-07-24 21:05:44.988164937 +0900
-@@ -92,7 +92,7 @@ int main(int argc, char** argv) {
- //
- // If it prints "correct" then the architecture should be here, in the "correct" section.
- #if defined(_M_X64) || defined(__x86_64__) || \
--    defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
-+    defined(__ARMEL__) || defined(__ARMEB__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
-     defined(__hppa__) || defined(__ia64__) || \
-     defined(__mips__) || \
+--- i18n/double-conversion-utils.h.orig        2020-03-11 18:16:11.000000000 +0000
++++ i18n/double-conversion-utils.h
+@@ -107,7 +107,7 @@ int main(int argc, char** argv) {
      defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
+     defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
+     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
+-    defined(__SH4__) || defined(__alpha__) || \
++    defined(__SH4__) || defined(__sh__) || defined(__alpha__) || \
+     defined(_MIPS_ARCH_MIPS32R2) || defined(__ARMEB__) ||\
+     defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \
+     defined(__riscv) || defined(__e2k__) || \