Skip to content

Commit 8d2680b

Browse files
MarkusVolkrpurdie
authored andcommitted
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. Hack it with sed Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1 parent ef94f35 commit 8d2680b

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

meta/recipes-support/libcheck/libcheck_0.15.2.bb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,23 @@ GITHUB_BASE_URI = "https://github.com/libcheck/check/releases/"
1818

1919
S = "${WORKDIR}/check-${PV}"
2020

21-
inherit autotools pkgconfig texinfo github-releases
22-
23-
CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk"
21+
inherit cmake pkgconfig texinfo github-releases
2422

2523
RREPLACES:${PN} = "check (<= 0.9.5)"
2624

25+
do_configure:append:class-target() {
26+
sed -i "s|@AWK_PATH@|${bindir}/awk|" ${S}/checkmk/checkmk.in
27+
}
28+
2729
do_install:append:class-native() {
2830
create_cmdline_shebang_wrapper ${D}${bindir}/checkmk
2931
}
32+
3033
BBCLASSEXTEND = "native nativesdk"
3134

3235
PACKAGES =+ "checkmk"
3336

3437
FILES:checkmk = "${bindir}/checkmk"
3538

3639
RDEPENDS:checkmk = "gawk"
40+

0 commit comments

Comments
 (0)