diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> | 2025-10-30 13:54:14 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-11-07 13:15:35 +0000 |
| commit | 14fc23e8609fb6d64dc744b8df86a9d431fa354b (patch) | |
| tree | 5cadfaa686ca29ba0598c38f93540cebc968a870 /meta | |
| parent | e1cca9803bf578de489c31e549cf8f41975e264a (diff) | |
| download | poky-14fc23e8609fb6d64dc744b8df86a9d431fa354b.tar.gz | |
libconfig: import recipe from meta-oe
One of the freedreno tools in the Mesa package depends on libconfig.
Recipes from other layers also depend on libconfig. It makes sense to
move libconfig to OE-Core in order to reduce inter-layer dependencies.
Changes between meta-oe and this recipe:
- Upgraded to 1.8.1
- Switched to UPSTREAM_CHECK_GITTAGREGEX
- Switched from autotools-brokensep to autotools
- Added a patch fixing reproducibility issues
(From OE-Core rev: 137d76e8b4b3499dfdaf4eecadf5728bd91c37f9)
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
3 files changed, 64 insertions, 0 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 6902bc0c44..6a0b4819c2 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
| @@ -329,6 +329,7 @@ RECIPE_MAINTAINER:pn-libcgroup = "Unassigned <unassigned@yoctoproject.org>" | |||
| 329 | RECIPE_MAINTAINER:pn-libcheck = "Yi Zhao <yi.zhao@windriver.com>" | 329 | RECIPE_MAINTAINER:pn-libcheck = "Yi Zhao <yi.zhao@windriver.com>" |
| 330 | RECIPE_MAINTAINER:pn-libclc = "Khem Raj <raj.khem@gmail.com>" | 330 | RECIPE_MAINTAINER:pn-libclc = "Khem Raj <raj.khem@gmail.com>" |
| 331 | RECIPE_MAINTAINER:pn-libcomps = "Unassigned <unassigned@yoctoproject.org>" | 331 | RECIPE_MAINTAINER:pn-libcomps = "Unassigned <unassigned@yoctoproject.org>" |
| 332 | RECIPE_MAINTAINER:pn-libconfig = "Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>" | ||
| 332 | RECIPE_MAINTAINER:pn-libconvert-asn1-perl = "Tim Orling <tim.orling@konsulko.com>" | 333 | RECIPE_MAINTAINER:pn-libconvert-asn1-perl = "Tim Orling <tim.orling@konsulko.com>" |
| 333 | RECIPE_MAINTAINER:pn-libcxx = "Khem Raj <raj.khem@gmail.com>" | 334 | RECIPE_MAINTAINER:pn-libcxx = "Khem Raj <raj.khem@gmail.com>" |
| 334 | RECIPE_MAINTAINER:pn-libdaemon = "Unassigned <unassigned@yoctoproject.org>" | 335 | RECIPE_MAINTAINER:pn-libdaemon = "Unassigned <unassigned@yoctoproject.org>" |
diff --git a/meta/recipes-extended/libconfig/libconfig/0001-Add-missing-dependency-for-scanner.h.patch b/meta/recipes-extended/libconfig/libconfig/0001-Add-missing-dependency-for-scanner.h.patch new file mode 100644 index 0000000000..6e6a9419ae --- /dev/null +++ b/meta/recipes-extended/libconfig/libconfig/0001-Add-missing-dependency-for-scanner.h.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From b9afffcee8809e47d0564f3d6376de724ae820ae Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> | ||
| 3 | Date: Wed, 29 Oct 2025 22:26:16 +0200 | ||
| 4 | Subject: [PATCH] Add missing dependency for scanner.h | ||
| 5 | |||
| 6 | Automake doesn't handle the header -> source dependency for lex | ||
| 7 | scanners. This might result in the out-of-date header or it not being | ||
| 8 | rebuilt in time. Provide a rule to make sure that the header is built | ||
| 9 | properly. | ||
| 10 | |||
| 11 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> | ||
| 12 | Upstream-Status: Submitted [https://github.com/hyperrealm/libconfig/pull/277] | ||
| 13 | --- | ||
| 14 | lib/Makefile.am | 3 +++ | ||
| 15 | 1 file changed, 3 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/lib/Makefile.am b/lib/Makefile.am | ||
| 18 | index 9ef984323af3..bd5d3dbe5aa3 100644 | ||
| 19 | --- a/lib/Makefile.am | ||
| 20 | +++ b/lib/Makefile.am | ||
| 21 | @@ -36,6 +36,9 @@ libinc_cpp = libconfig.h++ | ||
| 22 | |||
| 23 | BUILT_SOURCES = scanner.c scanner.h grammar.c grammar.h | ||
| 24 | |||
| 25 | +scanner.h: scanner.c | ||
| 26 | + @if test ! -f $@; then rm -f scanner.c; $(MAKE) $(AM_MAKEFLAGS) scanner.c; else :; fi | ||
| 27 | + | ||
| 28 | ## Build mode: C-only or C & C++ | ||
| 29 | lib_LTLIBRARIES = libconfig.la | ||
| 30 | |||
| 31 | -- | ||
| 32 | 2.51.0 | ||
| 33 | |||
diff --git a/meta/recipes-extended/libconfig/libconfig_1.8.1.bb b/meta/recipes-extended/libconfig/libconfig_1.8.1.bb new file mode 100644 index 0000000000..37c2504b01 --- /dev/null +++ b/meta/recipes-extended/libconfig/libconfig_1.8.1.bb | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | SUMMARY = "C/C++ Configuration File Library" | ||
| 2 | DESCRIPTION = "Library for manipulating structured configuration files" | ||
| 3 | HOMEPAGE = "https://hyperrealm.github.io/libconfig/" | ||
| 4 | BUGTRACKER = "https://github.com/hyperrealm/libconfig/issues" | ||
| 5 | SECTION = "libs" | ||
| 6 | |||
| 7 | LICENSE = "LGPL-2.1-only" | ||
| 8 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=17c8e32f0f72580cc2906b409d46b5ac" | ||
| 9 | |||
| 10 | SRC_URI = " \ | ||
| 11 | git://github.com/hyperrealm/libconfig.git;protocol=https;branch=master;tag=v${PV} \ | ||
| 12 | file://0001-Add-missing-dependency-for-scanner.h.patch \ | ||
| 13 | " | ||
| 14 | SRCREV = "47ec93c588f534d20f6ee8704d2a2cec339db7b7" | ||
| 15 | |||
| 16 | # needed when we modify grammar.y with patches | ||
| 17 | DEPENDS += "bison-native flex-native" | ||
| 18 | |||
| 19 | UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" | ||
| 20 | |||
| 21 | inherit autotools pkgconfig | ||
| 22 | |||
| 23 | PACKAGE_BEFORE_PN = "${PN}++" | ||
| 24 | FILES:${PN}++ = "${libdir}/${BPN}++*${SOLIBS}" | ||
| 25 | |||
| 26 | # remove autogenerated files which seem to trigger reproducibility issues | ||
| 27 | do_compile:prepend() { | ||
| 28 | rm -f ${S}/lib/grammar.[ch] | ||
| 29 | rm -f ${S}/lib/scanner.[ch] | ||
| 30 | } | ||
