mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
gnupg: Do not apply -Woverride-init guard for gcc >= 9
(From OE-Core rev: ee23aa985f72932330b6cbee3693611d98ee325a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -0,0 +1,31 @@
|
|||||||
|
From 0df5800cc2e720aad883a517f7d24a9722fe5845 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Thu, 20 Dec 2018 17:37:48 -0800
|
||||||
|
Subject: [PATCH] Woverride-init is not needed with gcc 9
|
||||||
|
|
||||||
|
Fixes
|
||||||
|
| ../../gnupg-2.2.12/dirmngr/dns.h:525:16: error: lvalue required as
|
||||||
|
unary '&' operand |
|
||||||
|
525 | dns_rr_i_init(&dns_quietinit((struct dns_rr_i){ 0, __VA_ARGS__
|
||||||
|
}), (P))
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
dirmngr/dns.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/dirmngr/dns.h b/dirmngr/dns.h
|
||||||
|
index 30d0b45..98fe412 100644
|
||||||
|
--- a/dirmngr/dns.h
|
||||||
|
+++ b/dirmngr/dns.h
|
||||||
|
@@ -154,7 +154,7 @@ DNS_PUBLIC int *dns_debug_p(void);
|
||||||
|
|
||||||
|
#define dns_quietinit(...) \
|
||||||
|
DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP
|
||||||
|
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4
|
||||||
|
+#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || (__GNUC__ > 4 && __GNUC__ < 9)
|
||||||
|
#define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push")
|
||||||
|
#define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"")
|
||||||
|
#define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop")
|
||||||
+3
-3
@@ -1,4 +1,4 @@
|
|||||||
From 8eb4d25c25a1c1323797d94e0727a3e42b7f3287 Mon Sep 17 00:00:00 2001
|
From c69c3a49f3295179c247db5ceb3ef8952928a724 Mon Sep 17 00:00:00 2001
|
||||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||||
Date: Mon, 22 Jan 2018 18:00:21 +0200
|
Date: Mon, 22 Jan 2018 18:00:21 +0200
|
||||||
Subject: [PATCH] configure.ac: use a custom value for the location of
|
Subject: [PATCH] configure.ac: use a custom value for the location of
|
||||||
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
index 4d66af9..b9ef235 100644
|
index 919ab31..cd58fdb 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -1848,7 +1848,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
|
@@ -1855,7 +1855,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
|
||||||
|
|
||||||
AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
|
AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
From f9fc214b0bf2f67b515ca8a5333f39c497d1b518 Mon Sep 17 00:00:00 2001
|
From 6d31b04d7a75f1d73c3518bf043b5b0a2dc40cb1 Mon Sep 17 00:00:00 2001
|
||||||
From: Ross Burton <ross.burton@intel.com>
|
From: Ross Burton <ross.burton@intel.com>
|
||||||
Date: Wed, 19 Sep 2018 14:44:40 +0100
|
Date: Wed, 19 Sep 2018 14:44:40 +0100
|
||||||
Subject: [PATCH] Allow the environment to override where gnupg looks for its
|
Subject: [PATCH] Allow the environment to override where gnupg looks for its
|
||||||
|
|||||||
@@ -14,7 +14,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
|
|||||||
file://0002-use-pkgconfig-instead-of-npth-config.patch \
|
file://0002-use-pkgconfig-instead-of-npth-config.patch \
|
||||||
file://0003-dirmngr-uses-libgpg-error.patch \
|
file://0003-dirmngr-uses-libgpg-error.patch \
|
||||||
file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
|
file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
|
||||||
"
|
file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \
|
||||||
|
"
|
||||||
SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \
|
SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \
|
||||||
file://relocate.patch"
|
file://relocate.patch"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user