From 6e8e969590a22a729db1ff342de57f2fd5d02d43 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Thu, 1 Oct 2020 15:27:27 +0200 Subject: gnupg: Build with "-fcommon" The patch from f9761c0 ("gnupg: Make it build with GCC 10 (which uses -fno-common by default)") doesn't work in all cases, such as when building gnupg-native. Instead of trying to patch around it, re-enable the -fcommon flag explicitly to keep the build the same as it was before GCC 10 changed the default. This reverts commit f9761c01495cd52ce88e33fbc8824f882cf80288. Signed-off-by: Joshua Watt Signed-off-by: Peter Kjellerstedt --- recipes-support/gnupg/gnupg_1.4.7.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'recipes-support/gnupg/gnupg_1.4.7.bb') diff --git a/recipes-support/gnupg/gnupg_1.4.7.bb b/recipes-support/gnupg/gnupg_1.4.7.bb index 6258809..c7da052 100644 --- a/recipes-support/gnupg/gnupg_1.4.7.bb +++ b/recipes-support/gnupg/gnupg_1.4.7.bb @@ -20,7 +20,6 @@ SRC_URI = "${GNUPG_MIRROR}/gnupg/gnupg-${PV}.tar.bz2 \ file://CVE-2013-4242.patch \ file://fix-ustar-check-issue.patch \ file://0001-Make-it-build-with-gettext-0.20.patch \ - file://0001-Make-it-build-with-GCC-10-which-uses-fno-common-by-d.patch \ " SRC_URI[md5sum] = "b06a141cca5cd1a55bbdd25ab833303c" @@ -89,6 +88,10 @@ EXTRA_OECONF = "--disable-ldap \ BUILD_CFLAGS += "-fgnu89-inline" CFLAGS += "-fgnu89-inline" +# Force -fcommon to avoid issues with GCC 10 (which defaults to -fno-common) +BUILD_CFLAGS += "-fcommon" +CFLAGS += "-fcommon" + do_install () { autotools_do_install install -d ${D}${docdir}/${BPN} -- cgit v1.2.3-54-g00ecf