Skip to contentSkip to conversation

clamav: add optional systemd dependency

PATCH New Fabrice Fontaine 2 participants 2 messages Dec 12, 2018 – Dec 13, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clamav: add optional systemd dependency

clamav has an optional systemd dependency

Moreover, since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute paths found in the .pc file. This is correct when the paths refer to something in STAGING_DIR (e.g. libdir, includedir), but not when it refers to something used for the target.

clamav uses the systemdsystemunitdir variable from systemd.pc to decide where to install things. Since DESTDIR is prepended to the install destination, this will end up in the wrong location.

Until a better solution is found in pkgconf, pass the systemdsystemunitdir to use explicitly instead of relying on systemd.pc.

Fixes:
- http://autobuild.buildroot.org/results/fe526c60542527112e6441e453b4df5de49242d9

---
 package/clamav/clamav.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/clamav/clamav.mk +7 -0
index 50990abad6..25ae240545 100644
@@ -85,4 +85,11 @@ else
 CLAMAV_CONF_OPTS += --without-pcre
 endif
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+CLAMAV_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
+CLAMAV_DEPENDENCIES += systemd
+else
+CLAMAV_CONF_OPTS += --with-systemdsystemunitdir=no
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 clamav: add optional systemd dependency

Hello,

Quoted 14 lines · Fabrice Fontaine

clamav has an optional systemd dependency

Moreover, since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute paths found in the .pc file. This is correct when the paths refer to something in STAGING_DIR (e.g. libdir, includedir), but not when it refers to something used for the target.

clamav uses the systemdsystemunitdir variable from systemd.pc to decide where to install things. Since DESTDIR is prepended to the install destination, this will end up in the wrong location.

Until a better solution is found in pkgconf, pass the systemdsystemunitdir to use explicitly instead of relying on systemd.pc.

Quoted 7 lines

Fixes:
- http://autobuild.buildroot.org/results/fe526c60542527112e6441e453b4df5de49242d9

---
 package/clamav/clamav.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com