From 01325361970e39f40b68dd1a2a3ecd988be044ae Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Aug 2022 23:01:47 +0200 Subject: [PATCH] package/ocrad: fix static build Fix the following static build failure raised since bump to version 0.28 in commit 1b677db703dc0b976a707942bbc94ecd3f7b4b4b: /home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libpng.a(png.o): in function `png_reset_crc': png.c:(.text+0x738): undefined reference to `crc32' Note that the custom, hand-rolled configure script inserts the LIBS we pass on the command line, in front of the hard-coded LIBS, which currently is just LIBS=-lpng, so we end up with a final LIBS set to: LIBS=-L.../sysroot/usr/lib -lpng16 -lz -lpng ... the latter -lpng being redundant and unnecessary, but innocuous. Fixes: - http://autobuild.buildroot.org/results/97543d8df5c40818e05622490e4aad60b48934a6 Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: split multi-line one item per line] Signed-off-by: Yann E. MORIN --- package/ocrad/ocrad.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk index 78638b770a..d62b7af351 100644 --- a/package/ocrad/ocrad.mk +++ b/package/ocrad/ocrad.mk @@ -10,12 +10,19 @@ OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad OCRAD_LICENSE = GPL-2.0+ OCRAD_LICENSE_FILES = COPYING OCRAD_INSTALL_STAGING = YES -OCRAD_DEPENDENCIES = libpng +OCRAD_DEPENDENCIES = host-pkgconf libpng + +OCRAD_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs libpng` # This is not a true autotools package. define OCRAD_CONFIGURE_CMDS cd $(@D) && \ - $(TARGET_MAKE_ENV) ./configure --prefix=/usr --sysconfdir=/etc $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + $(TARGET_CONFIGURE_OPTS) \ + LIBS="$(OCRAD_LIBS)" endef define OCRAD_BUILD_CMDS