| Message ID | 20240407161339.2439456-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/clamav: fix CLAMAV_LIBS | expand |
On 07/04/2024 18:13, Fabrice Fontaine wrote: > CLAMAV_LIBS is ignored since bump to version 1.0.1 and switch to It's actually the LIBS environment variable that was used. Applied to master, thanks. Regards, Arnout > cmake build system in commit 203725a46bc6b61ed7e4fdb3d76f62327d3e47fa > resulting in the following build failure: > > /home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-musleabihf/12.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: CMakeFiles/clamonacc.dir/inotif/hash.c.o: in function `onas_ht_add_hierarchy': > hash.c:(.text+0xa84): undefined reference to `fts_open' > > Fixes: 203725a46bc6b61ed7e4fdb3d76f62327d3e47fa > - http://autobuild.buildroot.org/results/fe71ab29d02caeed609f1a181fccbd46b6feff65 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/clamav/clamav.mk | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk > index 7c6dfce6f2..c548897c37 100644 > --- a/package/clamav/clamav.mk > +++ b/package/clamav/clamav.mk > @@ -45,9 +45,8 @@ CLAMAV_DEPENDENCIES += musl-fts > CLAMAV_LIBS += -lfts > endif > > -CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)" > - > CLAMAV_CONF_OPTS = \ > + -DCMAKE_EXE_LINKER_FLAGS="$(CLAMAV_LIBS)" \ > -DCMAKE_SKIP_INSTALL_RPATH=ON \ > -DENABLE_JSON_SHARED=ON \ > -DENABLE_MAN_PAGES=OFF \
diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 7c6dfce6f2..c548897c37 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -45,9 +45,8 @@ CLAMAV_DEPENDENCIES += musl-fts CLAMAV_LIBS += -lfts endif -CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)" - CLAMAV_CONF_OPTS = \ + -DCMAKE_EXE_LINKER_FLAGS="$(CLAMAV_LIBS)" \ -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DENABLE_JSON_SHARED=ON \ -DENABLE_MAN_PAGES=OFF \
CLAMAV_LIBS is ignored since bump to version 1.0.1 and switch to cmake build system in commit 203725a46bc6b61ed7e4fdb3d76f62327d3e47fa resulting in the following build failure: /home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-musleabihf/12.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: CMakeFiles/clamonacc.dir/inotif/hash.c.o: in function `onas_ht_add_hierarchy': hash.c:(.text+0xa84): undefined reference to `fts_open' Fixes: 203725a46bc6b61ed7e4fdb3d76f62327d3e47fa - http://autobuild.buildroot.org/results/fe71ab29d02caeed609f1a181fccbd46b6feff65 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/clamav/clamav.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)