From: Markus Volk Date: Tue, 10 Jun 2025 05:58:10 +0000 (+0200) Subject: libcheck: use cmake instead of autotools X-Git-Tag: uninative-4.8~115 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a61ed8dc5449bfb871379c6afd03c94ff27ca1fe;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git libcheck: use cmake instead of autotools - 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. Use a '-D' assignment to fix this (Thanks to Ross.Burton@arm.com). Signed-off-by: Markus Volk Signed-off-by: Mathieu Dubois-Briand --- diff --git a/meta/recipes-support/libcheck/libcheck_0.15.2.bb b/meta/recipes-support/libcheck/libcheck_0.15.2.bb index 5ab67b87286..8455f2c7483 100644 --- a/meta/recipes-support/libcheck/libcheck_0.15.2.bb +++ b/meta/recipes-support/libcheck/libcheck_0.15.2.bb @@ -18,15 +18,16 @@ 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)" +EXTRA_OECMAKE:append:class-target = " -DAWK_PATH=${bindir}/awk" + do_install:append:class-native() { create_cmdline_shebang_wrapper ${D}${bindir}/checkmk } + BBCLASSEXTEND = "native nativesdk" PACKAGES =+ "checkmk" @@ -34,3 +35,4 @@ PACKAGES =+ "checkmk" FILES:checkmk = "${bindir}/checkmk" RDEPENDS:checkmk = "gawk" +