From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by mail.openembedded.org (Postfix) with ESMTP id 7F2696BF3D for ; Fri, 21 Dec 2018 01:57:35 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id i12so1790156pfo.7 for ; Thu, 20 Dec 2018 17:57:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZMIKgWj6q8t48KQDCVFycnHObsygYrs/inlsJ4X9d38=; b=BdA1AfguKLHBhHyip4M3+sKq2pxYoSVXe2IMddJLqw+/8nqj+RvgKh8EIOqqC4daSp o3Gzyos4VZ/7icfzXfzDwRqD+PgX6zlh18jJyjVT+5izNFWaLsLWZcis5iyfpmZwkaAn fuKlCBzNXsCDOlEUHs7c43Sa+YpSL4Y5lVrGzOJAjHvW061/etQCgi5n4uDZbQKOs7Vv 4T4ktF5Tf/gCeSuve4LdzYayBSFwMc85Bbt/XZ2WDQnCoY27cHnrudGO0LOC3xf0Jecl UhcX2YRYgnRFRvMeKkz/QbFjoNN46IRul65fPWVu585bbyjUyLr3xCn0+R/1Uw0tw/oJ KGMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZMIKgWj6q8t48KQDCVFycnHObsygYrs/inlsJ4X9d38=; b=EA/z/CH+wVGe+x4rRmDh+q22AWZZmF/KKoP1yTmmMTf+CgQD9edW9ej5PwrVo7schv GKIclHljXvUhXGsUv7GJ7wYDTEnt4hEEWagYF586xMX//jueCL7nM6KSBNGwapO4iYRi xfqg9v0USySq1jR80AIz10E2/5vxsf8WHqnRHJ8h6ul9yytIO0pQ++Hh+0deNp97vh0m SRs84cQh+5xDYUSaaLEEvmaMDnlHwj0PNKcNRxxbKnDULj1a9cE5mFv9eVCgiLSzRyib yyI+ZEfMHwhUSsMzGWeq7nbVNxaUNsWDLkaqFQ6frqeeNqzZyCHCHxkia36/B7VRNwLG yPUg== X-Gm-Message-State: AA+aEWZrcqyrFLnLi4R0sy4tRF3gymianlujvOEWyvkxvhDIQr4FMjxh mMqTWRq3o5c1Mf8L2tVytdw2awd269Q= X-Google-Smtp-Source: AFSGD/XDI/KqxSYJZiL5dgsxthN7WX+p/rA6bwRKqYxtavzE1DQBz0VwiBbwAclhTed7FBUlrJ8NMw== X-Received: by 2002:a62:28c9:: with SMTP id o192mr575024pfo.57.1545357455798; Thu, 20 Dec 2018 17:57:35 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:877f:9499::19ec]) by smtp.gmail.com with ESMTPSA id h128sm35407961pgc.15.2018.12.20.17.57.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Dec 2018 17:57:35 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Thu, 20 Dec 2018 17:57:25 -0800 Message-Id: <20181221015726.30424-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [PATCH 1/2] gnupg: Do not apply -Woverride-init guard for gcc >= 9 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Dec 2018 01:57:35 -0000 Content-Transfer-Encoding: 8bit Signed-off-by: Khem Raj --- ...erride-init-is-not-needed-with-gcc-9.patch | 31 +++++++++++++++++++ ...-a-custom-value-for-the-location-of-.patch | 6 ++-- .../gnupg/gnupg/relocate.patch | 2 +- meta/recipes-support/gnupg/gnupg_2.2.12.bb | 3 +- 4 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch diff --git a/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch new file mode 100644 index 0000000000..4a280f9d5c --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch @@ -0,0 +1,31 @@ +From 0df5800cc2e720aad883a517f7d24a9722fe5845 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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") diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index 3f1c3abaeb..c43ecdf861 100644 --- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -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 Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 4d66af9..b9ef235 100644 +index 919ab31..cd58fdb 100644 --- a/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]) diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index c494ef80b7..1a5ea4aa2b 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -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 Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its diff --git a/meta/recipes-support/gnupg/gnupg_2.2.12.bb b/meta/recipes-support/gnupg/gnupg_2.2.12.bb index 1f381c2d91..a02c66a0c8 100644 --- a/meta/recipes-support/gnupg/gnupg_2.2.12.bb +++ b/meta/recipes-support/gnupg/gnupg_2.2.12.bb @@ -14,7 +14,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0002-use-pkgconfig-instead-of-npth-config.patch \ file://0003-dirmngr-uses-libgpg-error.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 \ file://relocate.patch" -- 2.20.1