From: Robert Yang Date: Thu, 4 Sep 2025 03:40:39 +0000 (-0700) Subject: libcheck: Fix do_install error with automake 1.18.1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf4227f982a845039acecedb78e20f109aa467d8;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git 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. Signed-off-by: Robert Yang Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- 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 @@ +From 6cc46c8ac0bfc012fcb6b0fd27e20d8c06c50919 Mon Sep 17 00:00:00 2001 +From: Jerry James +Date: Thu, 16 Jan 2025 09:42:41 -0700 +Subject: [PATCH] Fix texinfo errors and warnings + +A missing "@end verbatim" is an error with texinfo 7.2. +The warnings are due to menu and navigation mistakes. + +Upstream-Status: Submitted [https://github.com/libcheck/check/pull/361] + +Signed-off-by: Robert Yang +--- + doc/check.texi | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/doc/check.texi b/doc/check.texi +index f6852bc..b241961 100644 +--- a/doc/check.texi ++++ b/doc/check.texi +@@ -112,6 +112,11 @@ Test Fixtures + * Test Fixture Examples:: + * Checked vs Unchecked Fixtures:: + ++Selective Running of Tests ++ ++* Selecting Tests by Suite or Test Case:: ++* Selecting Tests Based on Arbitrary Tags:: ++ + Test Logging + + * XML Logging:: +@@ -974,8 +979,6 @@ easier for the developer to write, run, and analyze tests. + * Test Fixtures:: + * Multiple Suites in one SRunner:: + * Selective Running of Tests:: +-* Selecting Tests by Suite or Test Case:: +-* Selecting Tests Based on Arbitrary Tags:: + * Testing Signal Handling and Exit Values:: + * Looping Tests:: + * Test Timeouts:: +@@ -2048,7 +2051,7 @@ If both plain text and XML log files are specified, by any of above methods, + then check will log to both files. In other words logging in plain text and XML + format simultaneously is supported. + +-@node TAP Logging, , Test Logging, Test Logging ++@node TAP Logging, , XML Logging, Test Logging + @subsection TAP Logging + + @findex srunner_set_tap +@@ -2255,6 +2258,7 @@ your CMake build how to find it: + + @verbatim + cmake -Dcheck_ROOT=${INSTALL_PREFIX} ++@end verbatim + + Then use Check in your @file{CMakeLists.txt} like this: + +-- +2.49.0 + 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" SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/check-${PV}.tar.gz \ file://automake-output.patch \ - file://subunit.patch" + file://subunit.patch \ + file://0001-Fix-texinfo-errors-and-warnings.patch \ +" + SRC_URI[sha256sum] = "a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a" GITHUB_BASE_URI = "https://github.com/libcheck/check/releases/"