diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-12-04 21:07:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-09 12:20:32 +0000 |
commit | 9404999142c3a1476783cb6e2593c16a8ddcf133 (patch) | |
tree | a8aa31d9a6141c863c088e73e3b55e9e5e01aaa5 /meta | |
parent | 4993815b4731814d48b5b00b85dd6e7926abe085 (diff) | |
download | poky-9404999142c3a1476783cb6e2593c16a8ddcf133.tar.gz |
elfutils: upgrade 0.181 -> 0.182
(From OE-Core rev: f4cc0df90197e031326a3f823b37cc138950ca70)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.182.bb (renamed from meta/recipes-devtools/elfutils/elfutils_0.181.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/elfutils/files/0002-musl-libs.patch | 24 | ||||
-rw-r--r-- | meta/recipes-devtools/elfutils/files/0003-musl-utils.patch | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch | 2 |
6 files changed, 20 insertions, 22 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.181.bb b/meta/recipes-devtools/elfutils/elfutils_0.182.bb index 6c49a5fc26..f63208d72b 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.181.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.182.bb | |||
@@ -28,7 +28,7 @@ SRC_URI_append_libc-musl = " \ | |||
28 | file://0004-Fix-error-on-musl.patch \ | 28 | file://0004-Fix-error-on-musl.patch \ |
29 | file://0015-config-eu.am-do-not-use-Werror.patch \ | 29 | file://0015-config-eu.am-do-not-use-Werror.patch \ |
30 | " | 30 | " |
31 | SRC_URI[sha256sum] = "29a6ad7421ec2acfee489bb4a699908281ead2cb63a20a027ce8804a165f0eb3" | 31 | SRC_URI[sha256sum] = "ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858" |
32 | 32 | ||
33 | inherit autotools gettext ptest pkgconfig | 33 | inherit autotools gettext ptest pkgconfig |
34 | 34 | ||
diff --git a/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch b/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch index 67d4703c80..ca7caf08d8 100644 --- a/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch +++ b/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1a62bb8e8f2cb0f180c749946a48114e8f391b55 Mon Sep 17 00:00:00 2001 | 1 | From dbaa05a519acfe4f6040784f5d4a28ca586c0fc4 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Fri, 23 Aug 2019 10:17:25 +0800 | 3 | Date: Fri, 23 Aug 2019 10:17:25 +0800 |
4 | Subject: [PATCH] musl-obstack-fts | 4 | Subject: [PATCH] musl-obstack-fts |
@@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
20 | 3 files changed, 58 insertions(+), 4 deletions(-) | 20 | 3 files changed, 58 insertions(+), 4 deletions(-) |
21 | 21 | ||
22 | diff --git a/configure.ac b/configure.ac | 22 | diff --git a/configure.ac b/configure.ac |
23 | index ab9c751..b057d86 100644 | 23 | index 53bab6a..dfea85e 100644 |
24 | --- a/configure.ac | 24 | --- a/configure.ac |
25 | +++ b/configure.ac | 25 | +++ b/configure.ac |
26 | @@ -538,6 +538,60 @@ else | 26 | @@ -539,6 +539,60 @@ else |
27 | fi | 27 | fi |
28 | AC_SUBST([argp_LDADD]) | 28 | AC_SUBST([argp_LDADD]) |
29 | 29 | ||
diff --git a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch b/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch index 894e46c3c4..c6f766f680 100644 --- a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch +++ b/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2e1f8ca0b67c1d1991c14d509938c347e09bae94 Mon Sep 17 00:00:00 2001 | 1 | From f4ca9db9d38f865505322595a8a1e8f69d5bb87c Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Fri, 23 Aug 2019 10:18:47 +0800 | 3 | Date: Fri, 23 Aug 2019 10:18:47 +0800 |
4 | Subject: [PATCH] musl-libs | 4 | Subject: [PATCH] musl-libs |
@@ -21,8 +21,8 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
21 | lib/libeu.h | 1 + | 21 | lib/libeu.h | 1 + |
22 | libdwfl/dwfl_error.c | 9 +++++++++ | 22 | libdwfl/dwfl_error.c | 9 +++++++++ |
23 | libdwfl/linux-kernel-modules.c | 1 + | 23 | libdwfl/linux-kernel-modules.c | 1 + |
24 | libelf/elf.h | 9 ++++++--- | 24 | libelf/elf.h | 7 +++++++ |
25 | 6 files changed, 44 insertions(+), 4 deletions(-) | 25 | 6 files changed, 45 insertions(+), 1 deletion(-) |
26 | create mode 100644 lib/error.h | 26 | create mode 100644 lib/error.h |
27 | 27 | ||
28 | diff --git a/lib/error.h b/lib/error.h | 28 | diff --git a/lib/error.h b/lib/error.h |
@@ -104,7 +104,7 @@ index 7bcf61c..11dcc8b 100644 | |||
104 | return elf_errmsg (error & 0xffff); | 104 | return elf_errmsg (error & 0xffff); |
105 | case OTHER_ERROR (LIBDW): | 105 | case OTHER_ERROR (LIBDW): |
106 | diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c | 106 | diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c |
107 | index 0434f1e..5afaee8 100644 | 107 | index 6edb27f..f331e3c 100644 |
108 | --- a/libdwfl/linux-kernel-modules.c | 108 | --- a/libdwfl/linux-kernel-modules.c |
109 | +++ b/libdwfl/linux-kernel-modules.c | 109 | +++ b/libdwfl/linux-kernel-modules.c |
110 | @@ -50,6 +50,7 @@ | 110 | @@ -50,6 +50,7 @@ |
@@ -116,26 +116,24 @@ index 0434f1e..5afaee8 100644 | |||
116 | /* If fts.h is included before config.h, its indirect inclusions may not | 116 | /* If fts.h is included before config.h, its indirect inclusions may not |
117 | give us the right LFS aliases of these functions, so map them manually. */ | 117 | give us the right LFS aliases of these functions, so map them manually. */ |
118 | diff --git a/libelf/elf.h b/libelf/elf.h | 118 | diff --git a/libelf/elf.h b/libelf/elf.h |
119 | index 197b557..8e5b94c 100644 | 119 | index 6439c1a..a87c589 100644 |
120 | --- a/libelf/elf.h | 120 | --- a/libelf/elf.h |
121 | +++ b/libelf/elf.h | 121 | +++ b/libelf/elf.h |
122 | @@ -21,7 +21,9 @@ | 122 | @@ -19,6 +19,10 @@ |
123 | #ifndef _ELF_H | ||
124 | #define _ELF_H 1 | ||
123 | 125 | ||
124 | #include <features.h> | ||
125 | |||
126 | -__BEGIN_DECLS | ||
127 | +#ifdef __cplusplus | 126 | +#ifdef __cplusplus |
128 | +extern "C" { | 127 | +extern "C" { |
129 | +#endif | 128 | +#endif |
130 | 129 | + | |
131 | /* Standard ELF types. */ | 130 | /* Standard ELF types. */ |
132 | 131 | ||
133 | @@ -4103,6 +4105,7 @@ enum | 132 | #include <stdint.h> |
133 | @@ -4101,4 +4105,7 @@ enum | ||
134 | #define R_ARC_TLS_LE_S9 0x4a | 134 | #define R_ARC_TLS_LE_S9 0x4a |
135 | #define R_ARC_TLS_LE_32 0x4b | 135 | #define R_ARC_TLS_LE_32 0x4b |
136 | 136 | ||
137 | -__END_DECLS | ||
138 | - | ||
139 | +#ifdef __cplusplus | 137 | +#ifdef __cplusplus |
140 | +} | 138 | +} |
141 | +#endif | 139 | +#endif |
diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch index 2a21cd37ce..a8b39b5f93 100644 --- a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +++ b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9b237f19f82d5ab1e0702637fece1866b1ef6681 Mon Sep 17 00:00:00 2001 | 1 | From e7e5333ed2e19f25ecbd7121f424eec99d61265a Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Fri, 23 Aug 2019 10:19:48 +0800 | 3 | Date: Fri, 23 Aug 2019 10:19:48 +0800 |
4 | Subject: [PATCH] musl-utils | 4 | Subject: [PATCH] musl-utils |
@@ -58,7 +58,7 @@ index 6ba6af4..0c7674b 100644 | |||
58 | ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; | 58 | ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; |
59 | 59 | ||
60 | diff --git a/src/readelf.c b/src/readelf.c | 60 | diff --git a/src/readelf.c b/src/readelf.c |
61 | index 685d0b1..a842b10 100644 | 61 | index 64067a5..630739c 100644 |
62 | --- a/src/readelf.c | 62 | --- a/src/readelf.c |
63 | +++ b/src/readelf.c | 63 | +++ b/src/readelf.c |
64 | @@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p) | 64 | @@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p) |
@@ -142,7 +142,7 @@ index 48792a7..198a2e4 100644 | |||
142 | 142 | ||
143 | /* Name and version of program. */ | 143 | /* Name and version of program. */ |
144 | diff --git a/src/unstrip.c b/src/unstrip.c | 144 | diff --git a/src/unstrip.c b/src/unstrip.c |
145 | index 9b8c09a..1fb5063 100644 | 145 | index a855038..df6fc1c 100644 |
146 | --- a/src/unstrip.c | 146 | --- a/src/unstrip.c |
147 | +++ b/src/unstrip.c | 147 | +++ b/src/unstrip.c |
148 | @@ -56,6 +56,15 @@ | 148 | @@ -56,6 +56,15 @@ |
diff --git a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch b/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch index c79c737c62..0d162ebe1b 100644 --- a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch +++ b/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d3dc5f98f653342af97ebfbdf3479ee1f0d0cf38 Mon Sep 17 00:00:00 2001 | 1 | From ed87f11f7297c0edb3ca8950de1cc23e9b96217c Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Wed, 1 May 2019 22:15:03 +0100 | 3 | Date: Wed, 1 May 2019 22:15:03 +0100 |
4 | Subject: [PATCH] Fix error on musl: | 4 | Subject: [PATCH] Fix error on musl: |
diff --git a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch index 48fd4d41f3..ec1b927c2e 100644 --- a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch +++ b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9b7554a3e21ccb455b3661a6b4e767636c2c5cf3 Mon Sep 17 00:00:00 2001 | 1 | From 574ac484c01125a97ba8737cf7292ca926897310 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 22 Jun 2020 21:35:16 +0000 | 3 | Date: Mon, 22 Jun 2020 21:35:16 +0000 |
4 | Subject: [PATCH] config/eu.am: do not use -Werror | 4 | Subject: [PATCH] config/eu.am: do not use -Werror |