buildcpio.py: Apply patch to fix build with -fno-common
PATCH v2 1/2 buildcpio.py: Apply patch to fix build with -fno-common
This sed expression implements the needed patch to fix compilation with -fno-common, hopefully this patch will get included in 2.14 release and we can remove this operation
Signed-off-by Khem Raj <[email protected]>
---
v2: Fix the sdk sed expression, which seems to not work on v1
meta/lib/oeqa/runtime/cases/buildcpio.py | 3 ++- meta/lib/oeqa/sdk/cases/buildcpio.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
meta/lib/oeqa/runtime/cases/buildcpio.py +2 -1
@@ -27,6 +27,7 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure('--disable-maintainer-mode','') + self.project.run_configure('--disable-maintainer-mode', + 'sed -i -e "/char \*program_name/d" src/global.c;') self.project.run_make() self.project.run_install()
meta/lib/oeqa/sdk/cases/buildcpio.py +1 -0
@@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) + self._run("sed -i -e '/char.*program_name/d' {source}/src/global.c".format(**dirs)) self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) self._run("cd {build} && make install DESTDIR={install}".format(**dirs))
Signature · 1 line
2.28.0
PATCH 2/2 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 <[email protected]>
--- meta/lib/oeqa/sdk/cases/buildgalculator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/sdk/cases/buildgalculator.py +1 -1
@@ -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))
Signature · 1 line
2.28.0