diff --git a/package/kbd/0001-libkbdfile-fix-zlib-build.patch b/package/kbd/0001-libkbdfile-fix-zlib-build.patch new file mode 100644 index 0000000000..1324d0b53e --- /dev/null +++ b/package/kbd/0001-libkbdfile-fix-zlib-build.patch @@ -0,0 +1,35 @@ +From 488872421ef38215d2797f78497eb559d8eec32a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= +Date: Fri, 5 Dec 2025 16:45:36 +0100 +Subject: [PATCH] libkbdfile: fix zlib build + +Upstream: https://github.com/legionus/kbd/commit/2f9a4e56c2ef245fbe840677aad9d5932e17f50d + +Signed-off-by: Bernd Kuhls +--- + src/libkbdfile/elf-note.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/libkbdfile/elf-note.h b/src/libkbdfile/elf-note.h +index a0fd9e2..d3b8d5c 100644 +--- a/src/libkbdfile/elf-note.h ++++ b/src/libkbdfile/elf-note.h +@@ -26,14 +26,11 @@ int dlsym_many(void **dlp, const char *filename, ...); + */ + #define DLSYM_ARG(symbol__) &sym_##symbol__, STRINGIFY(symbol__), + +-/* For symbols being dynamically loaded */ +-#define DECLARE_DLSYM(symbol) static typeof(symbol) *sym_##symbol +- + /* + * Helper defines, to be done locally before including this header to switch between + * implementations + */ +-#define DECLARE_SYM(sym__) DECLARE_DLSYM(sym__); ++#define DECLARE_SYM(sym__) static typeof(sym__) *sym_##sym__; + + /* + * Originally from systemd codebase. +-- +2.47.3 + diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk index 8008a9b3be..34401075ce 100644 --- a/package/kbd/kbd.mk +++ b/package/kbd/kbd.mk @@ -13,6 +13,35 @@ KBD_CONF_OPTS = \ KBD_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ host-pkgconf + +ifeq ($(BR2_PACKAGE_BZIP2),y) +KBD_CONF_OPTS += --with-bzip2 +KBD_DEPENDENCIES += bzip2 +else +KBD_CONF_OPTS += --without-bzip2 +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +KBD_CONF_OPTS += --with-lzma +KBD_DEPENDENCIES += xz +else +KBD_CONF_OPTS += --without-lzma +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +KBD_CONF_OPTS += --with-zlib +KBD_DEPENDENCIES += zlib +else +KBD_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +KBD_CONF_OPTS += --with-zstd +KBD_DEPENDENCIES += zstd +else +KBD_CONF_OPTS += --without-zstd +endif + KBD_LICENSE = GPL-2.0+ KBD_LICENSE_FILES = COPYING CREDITS