Am Fri, 6 Oct 2017 07:33:52 +0200 schrieb Adam Ciarciński <adam%NetBSD.org@localhost>: > This breaks building on Darwin (a.k.a. macOS): > > digitlst.cpp:493:8: error: unknown type name 'locale_t' > static locale_t gCLocale = (locale_t)0; OK, I'm at a loss here … so xlocale.h is required for Darwin where new glibc dropped it and one should use locale.h instead. I am not sure about the behaviour of glibc on Darwin (there is a port?), but I found the condition +# if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__) in a patch for the same issue for another project. How about the updated patch that simply adds that one? It should leave Darwin in peace. But I wonder if the glibc version check alone wouldn't be better, except the glibc port on Darwin would stilly rely on the xlocale.h system header. Alrighty then, Thomas -- Dr. Thomas Orgis Universität Hamburg RRZ / Basis-Infrastruktur / HPC Schlüterstr. 70 20146 Hamburg Tel.: 040/42838 8826 Fax: 040/428 38 6270
Index: textproc/icu/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/textproc/icu/distinfo,v retrieving revision 1.66 diff -u -r1.66 distinfo --- textproc/icu/distinfo 4 Oct 2017 10:52:40 -0000 1.66 +++ textproc/icu/distinfo 6 Oct 2017 12:57:42 -0000 @@ -18,7 +18,7 @@ SHA1 (patch-config_mh-solaris-gcc) = e1097930f577917d3583e425d9d2affa1c3dcaf2 SHA1 (patch-configure) = fdeae51f4390779dfd8df8471196e322cbb9ea3d SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158 -SHA1 (patch-i18n_digitlst.cpp) = 2db1a8e28e353ecf201f965d9719d451534865ad +SHA1 (patch-i18n_digitlst.cpp) = ccae42e4ee6c6d50dd0cfa07dd29ac02e7a85671 SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663 SHA1 (patch-runConfigureICU) = ee780dbe797c7230208f378f73a0bc4d215b1bb2 SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110 Index: textproc/icu/patches/patch-i18n_digitlst.cpp =================================================================== RCS file: /cvsroot/pkgsrc/textproc/icu/patches/patch-i18n_digitlst.cpp,v retrieving revision 1.2 diff -u -r1.2 patch-i18n_digitlst.cpp --- textproc/icu/patches/patch-i18n_digitlst.cpp 12 Dec 2016 17:46:39 -0000 1.2 +++ textproc/icu/patches/patch-i18n_digitlst.cpp 6 Oct 2017 12:57:42 -0000 @@ -1,13 +1,14 @@ -$NetBSD: patch-i18n_digitlst.cpp,v 1.2 2016/12/12 17:46:39 adam Exp $ +$NetBSD$ --- i18n/digitlst.cpp.orig 2016-10-27 01:37:56.000000000 +0000 +++ i18n/digitlst.cpp -@@ -61,7 +61,7 @@ +@@ -61,7 +61,8 @@ #endif #if U_USE_STRTOD_L -# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN -+# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN || defined(__NetBSD__) ++# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN \ ++ || defined(__NETBSD__) || ((__GLIBC_MINOR__ >= 26) && !defined(__APPLE__)) # include <locale.h> # else # include <xlocale.h>
Attachment:
smime.p7s
Description: S/MIME cryptographic signature