summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2025-09-03 20:40:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-09-08 18:02:39 +0100
commit19a2b4f33fe848638f7a9f30fb770cf219416d77 (patch)
tree60b796961cca1474df01c270d89fa06255f247ef
parent8bf22b958c20494d5babedfb185fb3af95282145 (diff)
downloadpoky-19a2b4f33fe848638f7a9f30fb770cf219416d77.tar.gz
libcheck: Fix do_install error with automake 1.18.1
Fixed do_install error with automake 1.18 $ makeinfo -I ../../check-0.15.2/doc -o ../../check-0.15.2/doc/check.info \ ../../check-0.15.2/doc/check.texi [snip] check.texi:2329: no matching `@end verbatim' [snip] The automake before 1.17's mdate-sh couldn't update libcheck's doc/version.texi, so the doc/check.info wasn't re-generated, then we couldn't see the build error. (From OE-Core rev: bf4227f982a845039acecedb78e20f109aa467d8) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libcheck/libcheck/0001-Fix-texinfo-errors-and-warnings.patch60
-rw-r--r--meta/recipes-support/libcheck/libcheck_0.15.2.bb5
2 files changed, 64 insertions, 1 deletions
diff --git a/meta/recipes-support/libcheck/libcheck/0001-Fix-texinfo-errors-and-warnings.patch b/meta/recipes-support/libcheck/libcheck/0001-Fix-texinfo-errors-and-warnings.patch
new file mode 100644
index 0000000000..1edba3f1e1
--- /dev/null
+++ b/meta/recipes-support/libcheck/libcheck/0001-Fix-texinfo-errors-and-warnings.patch
@@ -0,0 +1,60 @@
1From 6cc46c8ac0bfc012fcb6b0fd27e20d8c06c50919 Mon Sep 17 00:00:00 2001
2From: Jerry James <loganjerry@gmail.com>
3Date: Thu, 16 Jan 2025 09:42:41 -0700
4Subject: [PATCH] Fix texinfo errors and warnings
5
6A missing "@end verbatim" is an error with texinfo 7.2.
7The warnings are due to menu and navigation mistakes.
8
9Upstream-Status: Submitted [https://github.com/libcheck/check/pull/361]
10
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12---
13 doc/check.texi | 10 +++++++---
14 1 file changed, 7 insertions(+), 3 deletions(-)
15
16diff --git a/doc/check.texi b/doc/check.texi
17index f6852bc..b241961 100644
18--- a/doc/check.texi
19+++ b/doc/check.texi
20@@ -112,6 +112,11 @@ Test Fixtures
21 * Test Fixture Examples::
22 * Checked vs Unchecked Fixtures::
23
24+Selective Running of Tests
25+
26+* Selecting Tests by Suite or Test Case::
27+* Selecting Tests Based on Arbitrary Tags::
28+
29 Test Logging
30
31 * XML Logging::
32@@ -974,8 +979,6 @@ easier for the developer to write, run, and analyze tests.
33 * Test Fixtures::
34 * Multiple Suites in one SRunner::
35 * Selective Running of Tests::
36-* Selecting Tests by Suite or Test Case::
37-* Selecting Tests Based on Arbitrary Tags::
38 * Testing Signal Handling and Exit Values::
39 * Looping Tests::
40 * Test Timeouts::
41@@ -2048,7 +2051,7 @@ If both plain text and XML log files are specified, by any of above methods,
42 then check will log to both files. In other words logging in plain text and XML
43 format simultaneously is supported.
44
45-@node TAP Logging, , Test Logging, Test Logging
46+@node TAP Logging, , XML Logging, Test Logging
47 @subsection TAP Logging
48
49 @findex srunner_set_tap
50@@ -2255,6 +2258,7 @@ your CMake build how to find it:
51
52 @verbatim
53 cmake -Dcheck_ROOT=${INSTALL_PREFIX}
54+@end verbatim
55
56 Then use Check in your @file{CMakeLists.txt} like this:
57
58--
592.49.0
60
diff --git a/meta/recipes-support/libcheck/libcheck_0.15.2.bb b/meta/recipes-support/libcheck/libcheck_0.15.2.bb
index 33f8f54888..adf95f5040 100644
--- a/meta/recipes-support/libcheck/libcheck_0.15.2.bb
+++ b/meta/recipes-support/libcheck/libcheck_0.15.2.bb
@@ -12,7 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1"
12 12
13SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/check-${PV}.tar.gz \ 13SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/check-${PV}.tar.gz \
14 file://automake-output.patch \ 14 file://automake-output.patch \
15 file://subunit.patch" 15 file://subunit.patch \
16 file://0001-Fix-texinfo-errors-and-warnings.patch \
17"
18
16SRC_URI[sha256sum] = "a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a" 19SRC_URI[sha256sum] = "a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a"
17GITHUB_BASE_URI = "https://github.com/libcheck/check/releases/" 20GITHUB_BASE_URI = "https://github.com/libcheck/check/releases/"
18 21