diff options
Diffstat (limited to 'meta/recipes-support/gnutls')
4 files changed, 54 insertions, 86 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 deleted file mode 100644 index 1e52d6abf5..0000000000 --- a/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
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 | |||
diff --git a/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch b/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch new file mode 100644 index 0000000000..f18f3c6267 --- /dev/null +++ b/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From a6f93b7ace347bc4fe29eb4a8fe4383d786cc8d0 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> | ||
3 | Date: Tue, 23 Jul 2019 20:44:01 +0200 | ||
4 | Subject: [PATCH] Fix LDFLAGS to AM_LDFLAGS in src/Makefile.am | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de> | ||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | src/Makefile.am | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
17 | index 5bf3622..4459767 100644 | ||
18 | --- a/src/Makefile.am | ||
19 | +++ b/src/Makefile.am | ||
20 | @@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \ | ||
21 | -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl $(CODE_COVERAGE_CPPFLAGS) | ||
22 | |||
23 | LDADD = ../lib/libtasn1.la | ||
24 | -LDFLAGS = $(CODE_COVERAGE_LDFLAGS) | ||
25 | +AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) | ||
26 | |||
27 | bin_PROGRAMS = asn1Parser asn1Coding asn1Decoding | ||
28 | |||
29 | -- | ||
30 | 2.21.0 | ||
31 | |||
diff --git a/meta/recipes-support/gnutls/libtasn1_4.13.bb b/meta/recipes-support/gnutls/libtasn1_4.13.bb deleted file mode 100644 index 9ee1913091..0000000000 --- a/meta/recipes-support/gnutls/libtasn1_4.13.bb +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | SUMMARY = "Library for ASN.1 and DER manipulation" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/libtasn1/" | ||
3 | |||
4 | LICENSE = "GPLv3+ & LGPLv2.1+" | ||
5 | LICENSE_${PN}-bin = "GPLv3+" | ||
6 | LICENSE_${PN} = "LGPLv2.1+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | ||
8 | file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ | ||
9 | file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351" | ||
10 | |||
11 | SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ | ||
12 | file://dont-depend-on-help2man.patch \ | ||
13 | file://0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch \ | ||
14 | " | ||
15 | |||
16 | DEPENDS = "bison-native" | ||
17 | |||
18 | SRC_URI[md5sum] = "ce2ba4d3088119b48e7531a703669c52" | ||
19 | SRC_URI[sha256sum] = "7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca" | ||
20 | |||
21 | inherit autotools texinfo lib_package gtk-doc | ||
22 | |||
23 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/recipes-support/gnutls/libtasn1_4.14.bb b/meta/recipes-support/gnutls/libtasn1_4.14.bb new file mode 100644 index 0000000000..cb7fed4449 --- /dev/null +++ b/meta/recipes-support/gnutls/libtasn1_4.14.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "Library for ASN.1 and DER manipulation" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/libtasn1/" | ||
3 | |||
4 | LICENSE = "GPLv3+ & LGPLv2.1+" | ||
5 | LICENSE_${PN}-bin = "GPLv3+" | ||
6 | LICENSE_${PN} = "LGPLv2.1+" | ||
7 | LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | ||
8 | file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ | ||
9 | file://LICENSE;md5=75ac100ec923f959898182307970c360" | ||
10 | |||
11 | SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ | ||
12 | file://dont-depend-on-help2man.patch \ | ||
13 | file://fix-ldflags.patch \ | ||
14 | " | ||
15 | |||
16 | DEPENDS = "bison-native" | ||
17 | |||
18 | SRC_URI[md5sum] = "e9918200ed4a778e2b3cbe34c1be4205" | ||
19 | SRC_URI[sha256sum] = "9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08" | ||
20 | |||
21 | inherit autotools texinfo lib_package gtk-doc | ||
22 | |||
23 | BBCLASSEXTEND = "native" | ||