summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2017-01-30 13:55:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-05 09:22:16 +0000
commitf27ce57b99c5b12df8aca065769d114cf060c044 (patch)
treec5503a58ddc6a43d661d55a4f5b87b3438ec376c /meta/recipes-support
parent34099fa18ce4dc83adfaa79ba9979b51bb0905fd (diff)
downloadpoky-f27ce57b99c5b12df8aca065769d114cf060c044.tar.gz
libtasn1: Upgrade 4.9 -> 4.10
Removed the following Backported patches: 1. 0001-configure-don-t-add-Werror-to-build-flags.patch 2. 0002-ASN.y-corrected-compiler-warning.patch 3. 0003-parser_aux-corrected-potential-null-pointer-derefere.patch 4. 0004-tools-eliminated-compiler-warnings.patch fixed the following build error with musl ... | from ../../libtasn1-4.10/gl/getopt.c:28: | ./stdint.h:89:5: error: #if with no expression | #if | ^ (From OE-Core rev: 70138279e4f4da74cd63402d7201c74ab2528fa8) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch28
-rw-r--r--meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch63
-rw-r--r--meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch28
-rw-r--r--meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch73
-rw-r--r--meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch56
-rw-r--r--meta/recipes-support/gnutls/libtasn1_4.10.bb (renamed from meta/recipes-support/gnutls/libtasn1_4.9.bb)9
6 files changed, 66 insertions, 191 deletions
diff --git a/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch b/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch
deleted file mode 100644
index ae643946f7..0000000000
--- a/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 908e9fa4c1172f09e0e45420a403dc25ed0a466c Mon Sep 17 00:00:00 2001
2From: Nikos Mavrogiannopoulos <nmav@redhat.com>
3Date: Tue, 26 Jul 2016 08:45:33 +0200
4Subject: [PATCH 1/4] configure: don't add -Werror to build flags
5
6---
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10 configure.ac | 2 --
11 1 file changed, 2 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index 7a14e04..066f5fe 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -70,8 +70,6 @@ AC_ARG_ENABLE([gcc-warnings],
18 )
19
20 if test "$gl_gcc_warnings" = yes; then
21- gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
22-
23 nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings
24 nw="$nw -Wc++-compat" # We don't care strongly about C++ compilers
25 nw="$nw -Wtraditional" # Warns on #elif which we use often
26--
271.9.1
28
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 @@
1From b17dbb8d3c5605db3a1d82861fcaeef4636d1117 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Thu, 26 Jan 2017 18:54:48 +0200
4Subject: [PATCH] stdint.m4: reintroduce GNULIB_OVERRIDES_WINT_T check
5
6Partially revert the gnulib commit: 5a400b3f5a1f5483dbfd75d38bdb7080218a063b
7to fix the build error with musl library.
8
9Upstream-Status: Inappropriate
10
11Signed-off-by: Maxin B. John <maxin.john@intel.com>
12---
13 gl/m4/stdint.m4 | 27 +++++++++++++++++++++++++++
14 1 file changed, 27 insertions(+)
15
16diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4
17index 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--
622.4.0
63
diff --git a/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch b/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch
deleted file mode 100644
index dd364223bd..0000000000
--- a/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 3542c01618fcde83b29640ea2c60bfd2629ae0b7 Mon Sep 17 00:00:00 2001
2From: Nikos Mavrogiannopoulos <nmav@redhat.com>
3Date: Tue, 26 Jul 2016 08:47:49 +0200
4Subject: [PATCH 2/4] ASN.y: corrected compiler warning
5
6---
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10 lib/ASN1.y | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/lib/ASN1.y b/lib/ASN1.y
14index 731415d..6db638f 100644
15--- a/lib/ASN1.y
16+++ b/lib/ASN1.y
17@@ -621,7 +621,7 @@ _asn1_create_errorDescription (int error, char *error_desc)
18 case ASN1_NAME_TOO_LONG:
19 snprintf (error_desc, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
20 "%s:%u: name too long (more than %u characters)", file_name,
21- line_number, ASN1_MAX_NAME_SIZE);
22+ line_number, (unsigned)ASN1_MAX_NAME_SIZE);
23 break;
24 case ASN1_IDENTIFIER_NOT_FOUND:
25 snprintf (error_desc, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
26--
271.9.1
28
diff --git a/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch b/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch
deleted file mode 100644
index 24201437b9..0000000000
--- a/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch
+++ /dev/null
@@ -1,73 +0,0 @@
1From c8903aa27dc9de1d9efeed9d1f7894f1019548f7 Mon Sep 17 00:00:00 2001
2From: Nikos Mavrogiannopoulos <nmav@redhat.com>
3Date: Tue, 26 Jul 2016 08:49:15 +0200
4Subject: [PATCH 3/4] parser_aux: corrected potential null pointer dereferences
5
6---
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10 lib/parser_aux.c | 12 ++++++------
11 1 file changed, 6 insertions(+), 6 deletions(-)
12
13diff --git a/lib/parser_aux.c b/lib/parser_aux.c
14index 2285b20..12ee16f 100644
15--- a/lib/parser_aux.c
16+++ b/lib/parser_aux.c
17@@ -637,7 +637,7 @@ _asn1_change_integer_value (asn1_node node)
18 p = NULL;
19 break;
20 }
21- if (p->right)
22+ if (p && p->right)
23 {
24 p = p->right;
25 break;
26@@ -753,7 +753,7 @@ _asn1_expand_object_id (asn1_node node)
27
28 if (move == RIGHT)
29 {
30- if (p->right)
31+ if (p && p->right)
32 p = p->right;
33 else
34 move = UP;
35@@ -828,7 +828,7 @@ _asn1_expand_object_id (asn1_node node)
36
37 if (move == RIGHT)
38 {
39- if (p->right)
40+ if (p && p->right)
41 p = p->right;
42 else
43 move = UP;
44@@ -898,7 +898,7 @@ _asn1_type_set_config (asn1_node node)
45
46 if (move == RIGHT)
47 {
48- if (p->right)
49+ if (p && p->right)
50 p = p->right;
51 else
52 move = UP;
53@@ -1007,7 +1007,7 @@ _asn1_check_identifier (asn1_node node)
54 p = NULL;
55 break;
56 }
57- if (p->right)
58+ if (p && p->right)
59 {
60 p = p->right;
61 break;
62@@ -1067,7 +1067,7 @@ _asn1_set_default_tag (asn1_node node)
63 p = NULL;
64 break;
65 }
66- if (p->right)
67+ if (p && p->right)
68 {
69 p = p->right;
70 break;
71--
721.9.1
73
diff --git a/meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch b/meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch
deleted file mode 100644
index 7bda0e6f24..0000000000
--- a/meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From d647bb2fa1bd288a6ac02c18318f3cba2a34c3a0 Mon Sep 17 00:00:00 2001
2From: Nikos Mavrogiannopoulos <nmav@redhat.com>
3Date: Tue, 26 Jul 2016 08:50:24 +0200
4Subject: [PATCH 4/4] tools: eliminated compiler warnings
5
6---
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10 src/asn1Coding.c | 2 +-
11 src/asn1Decoding.c | 2 +-
12 src/asn1Parser.c | 2 +-
13 3 files changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/src/asn1Coding.c b/src/asn1Coding.c
16index d4df593..b516bfe 100644
17--- a/src/asn1Coding.c
18+++ b/src/asn1Coding.c
19@@ -188,7 +188,7 @@ main (int argc, char *argv[])
20 default:
21 fprintf (stderr,
22 "asn1Coding: ?? getopt returned character code Ox%x ??\n",
23- option_result);
24+ (unsigned)option_result);
25 }
26 }
27
28diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c
29index 078963e..20f91ac 100644
30--- a/src/asn1Decoding.c
31+++ b/src/asn1Decoding.c
32@@ -131,7 +131,7 @@ main (int argc, char *argv[])
33 default:
34 fprintf (stderr,
35 "asn1Decoding: ?? getopt returned character code Ox%x ??\n",
36- option_result);
37+ (unsigned)option_result);
38 }
39 }
40
41diff --git a/src/asn1Parser.c b/src/asn1Parser.c
42index 7a3ae67..475bfc9 100644
43--- a/src/asn1Parser.c
44+++ b/src/asn1Parser.c
45@@ -139,7 +139,7 @@ main (int argc, char *argv[])
46 default:
47 fprintf (stderr,
48 "asn1Parser: ?? getopt returned character code Ox%x ??\n",
49- option_result);
50+ (unsigned)option_result);
51 }
52
53 }
54--
551.9.1
56
diff --git a/meta/recipes-support/gnutls/libtasn1_4.9.bb b/meta/recipes-support/gnutls/libtasn1_4.10.bb
index 3da5d4bcc5..33a768dae0 100644
--- a/meta/recipes-support/gnutls/libtasn1_4.9.bb
+++ b/meta/recipes-support/gnutls/libtasn1_4.10.bb
@@ -10,16 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
10 10
11SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ 11SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
12 file://dont-depend-on-help2man.patch \ 12 file://dont-depend-on-help2man.patch \
13 file://0001-configure-don-t-add-Werror-to-build-flags.patch \ 13 file://0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch \
14 file://0002-ASN.y-corrected-compiler-warning.patch \
15 file://0003-parser_aux-corrected-potential-null-pointer-derefere.patch \
16 file://0004-tools-eliminated-compiler-warnings.patch \
17 " 14 "
18 15
19DEPENDS = "bison-native" 16DEPENDS = "bison-native"
20 17
21SRC_URI[md5sum] = "3018d0f466a32b66dde41bb122e6cab6" 18SRC_URI[md5sum] = "f4faffdf63969d0e4e6df43b9679e8e5"
22SRC_URI[sha256sum] = "4f6f7a8fd691ac2b8307c8ca365bad711db607d4ad5966f6938a9d2ecd65c920" 19SRC_URI[sha256sum] = "681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02"
23 20
24inherit autotools texinfo binconfig lib_package gtk-doc 21inherit autotools texinfo binconfig lib_package gtk-doc
25 22
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 02:48:02 +0000