From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 17 Aug 2020 03:30:16 +0000 (-0700)
Subject: buildgalculator: Patch to fix build with -fno-common
X-Git-Tag: uninative-2.9~36
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=93a62e6b35d1a6ed3c678f8e27508dd0cdbdbbe4;p=openembedded-core.git

buildgalculator: Patch to fix build with -fno-common

We need to apply a patch to galculator for it to build with gcc-10+
Remove double definition of 'prefs' variable

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/sdk/cases/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py
index bbaa5c55c9..1121ed20ef 100644
--- a/meta/lib/oeqa/sdk/cases/buildgalculator.py
+++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py
@@ -35,7 +35,7 @@ class GalculatorTest(OESDKTestCase):
             self.assertTrue(os.path.isdir(dirs["source"]))
             os.makedirs(dirs["build"])
 
-            self._run("cd {source} && autoreconf -i -f -I $OECORE_TARGET_SYSROOT/usr/share/aclocal -I m4".format(**dirs))
+            self._run("cd {source} && sed -i -e '/s_preferences.*prefs;/d' src/main.c && autoreconf -i -f -I $OECORE_TARGET_SYSROOT/usr/share/aclocal -I m4".format(**dirs))
             self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs))
             self._run("cd {build} && make -j".format(**dirs))
             self._run("cd {build} && make install DESTDIR={install}".format(**dirs))