From a8b421598577243c50d555dae3c6eaa7646df996 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 16 Aug 2020 20:30:15 -0700 Subject: 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 (From OE-Core rev: 77b2e00c37c661a502bb47fcbbeb2e71aca5b9ce) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/buildcpio.py | 3 ++- meta/lib/oeqa/sdk/cases/buildcpio.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index d0f91668b2..e29bf16ccb 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py @@ -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() diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index 902e93f623..e565826541 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -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)) -- cgit v1.2.3-54-g00ecf