diff options
Diffstat (limited to 'meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch')
-rw-r--r-- | meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch b/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch new file mode 100644 index 0000000000..1e52d6abf5 --- /dev/null +++ b/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | From b17dbb8d3c5605db3a1d82861fcaeef4636d1117 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Maxin B. John" <maxin.john@intel.com> | ||
3 | Date: Thu, 26 Jan 2017 18:54:48 +0200 | ||
4 | Subject: [PATCH] stdint.m4: reintroduce GNULIB_OVERRIDES_WINT_T check | ||
5 | |||
6 | Partially revert the gnulib commit: 5a400b3f5a1f5483dbfd75d38bdb7080218a063b | ||
7 | to fix the build error with musl library. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
12 | --- | ||
13 | gl/m4/stdint.m4 | 27 +++++++++++++++++++++++++++ | ||
14 | 1 file changed, 27 insertions(+) | ||
15 | |||
16 | diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4 | ||
17 | index 4ac854d..3dc3da1 100644 | ||
18 | --- a/gl/m4/stdint.m4 | ||
19 | +++ b/gl/m4/stdint.m4 | ||
20 | @@ -355,6 +355,32 @@ int32_t i32 = INT32_C (0x7fffffff); | ||
21 | gl_STDINT_TYPE_PROPERTIES | ||
22 | fi | ||
23 | |||
24 | + dnl Determine whether gnulib's <wchar.h> or <wctype.h> would, if present, | ||
25 | + dnl override 'wint_t'. | ||
26 | + AC_CACHE_CHECK([whether wint_t is too small], | ||
27 | + [gl_cv_type_wint_t_too_small], | ||
28 | + [AC_COMPILE_IFELSE( | ||
29 | + [AC_LANG_PROGRAM([[ | ||
30 | + /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before | ||
31 | + <wchar.h>. | ||
32 | + BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be | ||
33 | + included before <wchar.h>. */ | ||
34 | + #if !(defined __GLIBC__ && !defined __UCLIBC__) | ||
35 | + # include <stddef.h> | ||
36 | + # include <stdio.h> | ||
37 | + # include <time.h> | ||
38 | + #endif | ||
39 | + #include <wchar.h> | ||
40 | + int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; | ||
41 | + ]])], | ||
42 | + [gl_cv_type_wint_t_too_small=no], | ||
43 | + [gl_cv_type_wint_t_too_small=yes])]) | ||
44 | + if test $gl_cv_type_wint_t_too_small = yes; then | ||
45 | + GNULIB_OVERRIDES_WINT_T=1 | ||
46 | + else | ||
47 | + GNULIB_OVERRIDES_WINT_T=0 | ||
48 | + fi | ||
49 | + | ||
50 | dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. | ||
51 | LIMITS_H=limits.h | ||
52 | AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) | ||
53 | @@ -363,6 +389,7 @@ int32_t i32 = INT32_C (0x7fffffff); | ||
54 | AC_SUBST([HAVE_SYS_BITYPES_H]) | ||
55 | AC_SUBST([HAVE_SYS_INTTYPES_H]) | ||
56 | AC_SUBST([STDINT_H]) | ||
57 | + AC_SUBST([GNULIB_OVERRIDES_WINT_T]) | ||
58 | AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"]) | ||
59 | ]) | ||
60 | |||
61 | -- | ||
62 | 2.4.0 | ||
63 | |||