]> code.ossystems Code Review - openembedded-core.git/commitdiff
buildgalculator: Patch to fix build with -fno-common
authorKhem Raj <raj.khem@gmail.com>
Mon, 17 Aug 2020 03:30:16 +0000 (20:30 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 18 Aug 2020 10:43:32 +0000 (11:43 +0100)
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>
meta/lib/oeqa/sdk/cases/buildgalculator.py

index bbaa5c55c913866e632db4cbccd6454790e4f5ed..1121ed20efd5f1c881b37a2107dc4f82ec6fb29c 100644 (file)
@@ -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))