| Message ID | 20250606084539.2960891-1-f_l_k@t-online.de |
|---|---|
| State | New |
| Headers | show |
| Series | libcheck: use cmake instead of autotools | expand |
On 6 Jun 2025, at 09:45, Markus Volk via lists.openembedded.org <f_l_k=t-online.de@lists.openembedded.org> wrote: > +do_configure:append:class-target() { > + sed -i "s|@AWK_PATH@|${bindir}/awk|" ${S}/checkmk/checkmk.in > +} As libcheck uses find_program which can be seeded with a -D assignment, a neater solution would be something like: EXTRA_OECMAKE:append:class-target = “ -DAWK_PATH=${bindir}/awk" Ross
diff --git a/meta/recipes-support/libcheck/libcheck_0.15.2.bb b/meta/recipes-support/libcheck/libcheck_0.15.2.bb index 5ab67b8728..34d41ce2ff 100644 --- a/meta/recipes-support/libcheck/libcheck_0.15.2.bb +++ b/meta/recipes-support/libcheck/libcheck_0.15.2.bb @@ -18,15 +18,18 @@ GITHUB_BASE_URI = "https://github.com/libcheck/check/releases/" S = "${WORKDIR}/check-${PV}" -inherit autotools pkgconfig texinfo github-releases - -CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk" +inherit cmake pkgconfig texinfo github-releases RREPLACES:${PN} = "check (<= 0.9.5)" +do_configure:append:class-target() { + sed -i "s|@AWK_PATH@|${bindir}/awk|" ${S}/checkmk/checkmk.in +} + do_install:append:class-native() { create_cmdline_shebang_wrapper ${D}${bindir}/checkmk } + BBCLASSEXTEND = "native nativesdk" PACKAGES =+ "checkmk" @@ -34,3 +37,4 @@ PACKAGES =+ "checkmk" FILES:checkmk = "${bindir}/checkmk" RDEPENDS:checkmk = "gawk" +
- this fixes a build issue seen with current master-next branch: | check.texi:1610: warning: node prev pointer for `Testing Signal Handling and Exit Values' is `Selective Running of Tests' but prev is `Selecting Tests Based on Arbitrary Tags' in menu | check.texi:2051: warning: node prev pointer for `TAP Logging' is `Test Logging' but prev is `XML Logging' in menu | make[2]: Leaving directory '/home/flk/poky/build/tmp/work/corei7-64-poky-linux/libcheck/0.15.2/build/doc' | make[2]: *** [Makefile:452: ../../check-0.15.2/doc/check.info] Error 1 | make[1]: *** [Makefile:574: all-recursive] Error 1 | make[1]: Leaving directory '/home/flk/poky/build/tmp/work/corei7-64-poky-linux/libcheck/0.15.2/build' | make: *** [Makefile:420: all] Error 2 | ERROR: oe_runmake failed | WARNING: /home/flk/poky/build/ - checkmk adds a reproducibility issue. @AWK_PATH@ is unique, because awk is in hosttools. We dont want it that way for target. Hack it with sed Signed-off-by: Markus Volk <f_l_k@t-online.de> --- meta/recipes-support/libcheck/libcheck_0.15.2.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)