diff options
3 files changed, 0 insertions, 63 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 50b897181f..9b92e7e3d5 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |||
| @@ -350,7 +350,6 @@ RDEPENDS:packagegroup-meta-oe-extended = "\ | |||
| 350 | jpnevulator \ | 350 | jpnevulator \ |
| 351 | libblockdev \ | 351 | libblockdev \ |
| 352 | libcec \ | 352 | libcec \ |
| 353 | libconfig \ | ||
| 354 | libdivecomputer \ | 353 | libdivecomputer \ |
| 355 | libfastjson \ | 354 | libfastjson \ |
| 356 | libfile-fnmatch-perl \ | 355 | libfile-fnmatch-perl \ |
diff --git a/meta-oe/recipes-extended/libconfig/libconfig/0001-Fix-declarations-to-allow-build-with-gcc-15.patch b/meta-oe/recipes-extended/libconfig/libconfig/0001-Fix-declarations-to-allow-build-with-gcc-15.patch deleted file mode 100644 index 00ceadb10d..0000000000 --- a/meta-oe/recipes-extended/libconfig/libconfig/0001-Fix-declarations-to-allow-build-with-gcc-15.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From 0511e285f3c886a388b8e9c6a4829752d60ab44c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rudi Heitbaum <rudi@heitbaum.com> | ||
| 3 | Date: Thu, 5 Dec 2024 06:47:40 +0000 | ||
| 4 | Subject: [PATCH] Fix declarations to allow build with gcc 15 | ||
| 5 | |||
| 6 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
| 7 | |||
| 8 | Upstream-Status: Backport [690342b Fix declarations to allow build with gcc 15] | ||
| 9 | --- | ||
| 10 | lib/grammar.y | 8 ++++++-- | ||
| 11 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/lib/grammar.y b/lib/grammar.y | ||
| 14 | index 87dac00..0e9d0bb 100644 | ||
| 15 | --- a/lib/grammar.y | ||
| 16 | +++ b/lib/grammar.y | ||
| 17 | @@ -40,8 +40,7 @@ | ||
| 18 | #include "wincompat.h" | ||
| 19 | |||
| 20 | /* These declarations are provided to suppress compiler warnings. */ | ||
| 21 | -extern int libconfig_yylex(); | ||
| 22 | -extern int libconfig_yyget_lineno(); | ||
| 23 | +extern int libconfig_yyget_lineno(void *); | ||
| 24 | |||
| 25 | static const char *err_array_elem_type = "mismatched element type in array"; | ||
| 26 | static const char *err_duplicate_setting = "duplicate setting name"; | ||
| 27 | @@ -80,6 +79,11 @@ void libconfig_yyerror(void *scanner, struct parse_context *ctx, | ||
| 28 | char *sval; | ||
| 29 | } | ||
| 30 | |||
| 31 | +%{ | ||
| 32 | +/* These declarations are provided to suppress compiler warnings. */ | ||
| 33 | +extern int libconfig_yylex(YYSTYPE *, void *); | ||
| 34 | +%} | ||
| 35 | + | ||
| 36 | %token <ival> TOK_BOOLEAN TOK_INTEGER TOK_HEX | ||
| 37 | %token <llval> TOK_INTEGER64 TOK_HEX64 | ||
| 38 | %token <fval> TOK_FLOAT | ||
diff --git a/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb b/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb deleted file mode 100644 index bd7d7e64b8..0000000000 --- a/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 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=fad9b3332be894bab9bc501572864b29" | ||
| 9 | |||
| 10 | SRC_URI = "git://github.com/hyperrealm/libconfig.git;protocol=https;branch=master;tag=v${PV} \ | ||
| 11 | file://0001-Fix-declarations-to-allow-build-with-gcc-15.patch \ | ||
| 12 | " | ||
| 13 | SRCREV = "525922a6b49ca19235cdf307376e7c9c539d1b93" | ||
| 14 | |||
| 15 | # needed when we modify grammar.y with above patch | ||
| 16 | DEPENDS += "bison-native" | ||
| 17 | |||
| 18 | UPSTREAM_CHECK_URI = "https://github.com/hyperrealm/libconfig/releases" | ||
| 19 | UPSTREAM_CHECK_REGEX = "Version (?P<pver>\d+(\.\d+)+)" | ||
| 20 | |||
| 21 | inherit autotools-brokensep pkgconfig | ||
| 22 | |||
| 23 | PACKAGE_BEFORE_PN = "${PN}++" | ||
| 24 | FILES:${PN}++ = "${libdir}/${BPN}++*${SOLIBS}" | ||
