From 7f23c56031945f7b0af407b509d454101d00aa1e Mon Sep 17 00:00:00 2001 From: mglae Date: Fri, 22 Nov 2024 19:40:27 +0100 Subject: [PATCH] lirc: remove confusing static config.h in lirc 0.10.2 release package Left over lib/lirc/config.h lead to "LIRC_LOCKDIR" redefined to not existing "/var/lock/lockdir" (beside others): /home/docker/LibreELEC.tv/build.LibreELEC-gbm.x86_64-12.0-devel-mg/build/lirc-0.10.2/lib/lirc/config.h:198: warning: "LIRC_LOCKDIR" redefined 198 | #define LIRC_LOCKDIR "/var/lock/lockdev" | In file included from /home/docker/LibreELEC.tv/build.LibreELEC-gbm.x86_64-12.0-devel-mg/build/lirc-0.10.2/lib/driver.c:12: ./config.h:198: note: this is the location of the previous definition 198 | #define LIRC_LOCKDIR "/var/lock" | Furthermore define lock dir because lirc's configure does check the host system and use /var/lock/lockdev if existing. --- packages/sysutils/lirc/package.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/sysutils/lirc/package.mk b/packages/sysutils/lirc/package.mk index b0ff6084ee..a6c36eac10 100644 --- a/packages/sysutils/lirc/package.mk +++ b/packages/sysutils/lirc/package.mk @@ -16,7 +16,14 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-devinput \ --enable-uinput \ --with-gnu-ld \ --without-x \ - --runstatedir=/run" + --runstatedir=/run \ + --with-lockdir=/var/lock" + +post_unpack() { + # remove confusing static config.h in lirc 0.10.2 release package (temp fix) + # lead to "LIRC_LOCKDIR" redefined to "/var/lock/lockdir" + rm ${PKG_BUILD}/lib/lirc/config.h +} pre_configure_target() { export HAVE_WORKING_POLL=yes @@ -32,9 +39,6 @@ pre_configure_target() { post_configure_target() { libtool_remove_rpath libtool - - nodots=$(grep "#define VERSION_NODOTS" ../lib/lirc/config.h) - sed -i "s/^#define VERSION_NODOTS.*/${nodots}/" config.h } post_makeinstall_target() {