From patchwork Thu Oct 10 15:49:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 175788 Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp2482446ocf; Thu, 10 Oct 2019 08:51:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqw6fPgWcouAWX630mfsTjxlSNRAX3nXfBpKUy+tH2zUSsu6hm7VxD9SCYuZeu8pxsP+3N6+ X-Received: by 2002:a65:6394:: with SMTP id h20mr11706327pgv.272.1570722694222; Thu, 10 Oct 2019 08:51:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570722694; cv=none; d=google.com; s=arc-20160816; b=RK0FaQrSj151c2sxSgtti9H1vRSFDBaB2e7LVKXoSaFXml0UjFAxhs1C6ZP3Yazpu8 bOASWaju8yWHQ5vgI1RZGF+ZANQggg1y2zthqJQme0FU1IKoHLB+ymIm4lgbkQKYNRtb P8hvjS7LLwqWuuGDwGkW+Y65c1REqCQ1k0yK13usy3F1KqedTI3G8kIwYdJrI/I6PQzm XjNNXuGqDI2J5BuxO6wvuhIOES8wg2BZxybIbt4Rqi7XcXtEk8YrFHsfd93AoqK2+JXB VszLE4QokLqhr8MgQWE2D0I+IhmT78gPC8Q8EjlXbH+tNe6ajBl4MZ2Z9hT90ConBrqv XydA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=j62XrB/dw5MTWqm9NH090PRUVDJ5kx2ybVUs56nlOFY=; b=qKGygemwOnsGBrsg6yPeV4kbe1KaYfihUOLpqfy3WTKIGAsheggWTnbgqhPF6yExsP X8iASn+IBdS1ilguCiXc/5tiy85uE2MIQpGVCT/aVspU9cUPI+PoIEvOxIXpUpKWnyg6 L1V5nXnI+AfnAac1OFcGv9zKZh75EL7bnPJ4kSe1Mf1VqnTa8WGLE79xBJB3YW7iEdVY kmrMTSXX7tymnhYbKCRj9kmxv9e+G/Ghlo60eBNwGqSFT6Gva+6tKJ3IY0k2N0eD4fPS KtNDu6cRQkc/dDGIHJECeivRshtrXd0/Z5kjmitVit+XdGP37bDknLb+eN2e9o3dO6QY pTvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uFfsVbHE; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id u28si6752702pgk.378.2019.10.10.08.51.33; Thu, 10 Oct 2019 08:51:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uFfsVbHE; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 53D587F537; Thu, 10 Oct 2019 15:50:20 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mail.openembedded.org (Postfix) with ESMTP id 0CD8A7F50D for ; Thu, 10 Oct 2019 15:49:44 +0000 (UTC) Received: by mail-pg1-f182.google.com with SMTP id i32so3927749pgl.10 for ; Thu, 10 Oct 2019 08:49:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=6lvPdhX3W7qULK0Hg0TEorIDhf++QylHMU7Yv8auhYE=; b=uFfsVbHETHxwsO9zt/2bcMWupR0zKhHZ8JwHeWkuH+7beHvpntI+UmZac30nG6NioJ cy1ww63PX8+u7zyUPYswb8ZdVVjkbOVfxvBs6KCfOcVGPrNyNIUo6Mc16P/gFj/BmiSs wEc7jwMFgiE7+rEeTHnc7NCkIpRmPywLSYtB71ywkq17Kcf4t2hpq5c2v7HQPx2cstDV Feyz7FSc3b9NrZmdAS36PJPvxS2bWtMTn9UcVbZu56h9n3g1uLVQphye0p+mne3QtUZ+ UKGgfLMK2XCGivgLMA6/dRlhKgruBo+IbCsRHmGjfHJ5lSHK1vyvyHHX6NGTwcSXgB1o K+NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=6lvPdhX3W7qULK0Hg0TEorIDhf++QylHMU7Yv8auhYE=; b=HWJWT6k1gXLPmL5v5IX4Ycuyi3qXn7RHvu6NMvBvso9JJv/4V46t5+ItxCDig7YFc5 SNCzOBjkXLz42QdWLG+c1g6YZd7drPI1Q1QEoneL2zSAjxlj0BjOsGzAmefnDJBSLpMm xOeK/x5QTfgHOxaacVAAJ5iFDm9Rzs4HmYGumVB4LvOZSS+hH4Bcb1D7iqSC6i4wnFX0 5uLdwU2vAioRENbw+iGOX7QtoZyvh2Oio4MzZGcKGFYUxotD3n4Uh7HaaJqK72fKK+HO SBjv3p93Oj8/d6ssE68JkebqlY7C4uaIaIQPfnVxjeDrVZPpEEfA9mnFUkq9+t3cGS6A A9nw== X-Gm-Message-State: APjAAAVfEJZQTDW4EH+3tzJ7UqESqMwfO4zYU+8TAh6FzkWz0nbn+49R YGU16LSJmIE9VvazitsoM7BW98GH X-Received: by 2002:a17:90a:c389:: with SMTP id h9mr12423227pjt.11.1570722585926; Thu, 10 Oct 2019 08:49:45 -0700 (PDT) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:ac6d:f6a6:e34b:c619]) by smtp.gmail.com with ESMTPSA id m26sm9872552pgn.71.2019.10.10.08.49.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Oct 2019 08:49:45 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Thu, 10 Oct 2019 08:49:23 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [thud 11/12] 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- ...1-Woverride-init-is-not-needed-with-gcc-9.patch | 31 ++++++++++++++++++++++ ...c-use-a-custom-value-for-the-location-of-.patch | 6 ++--- meta/recipes-support/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 -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core 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 0000000..4a280f9 --- /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 3f1c3ab..c43ecdf 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 c494ef8..1a5ea4a 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 1f381c2..a02c66a 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"