keepalived: fix systemd build with pkgconf 1.5.3
PATCH 1/1 keepalived: fix systemd build with pkgconf 1.5.3
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.
alsa-utils 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/34690fd724332c154971d5363a4c84e97a5e9ae9
--- package/keepalived/keepalived.mk | 6 ++++++ 1 file changed, 6 insertions(+)
package/keepalived/keepalived.mk +6 -0
@@ -46,4 +46,10 @@ else KEEPALIVED_CONF_OPTS += --disable-libiptc endif +ifeq ($(BR2_INIT_SYSTEMD),y) +KEEPALIVED_CONF_OPTS += \ + --with-init=systemd \ + --with-systemdsystemunitdir=/usr/lib/systemd/system +endif + $(eval $(autotools-package))
Signature · 1 line
2.14.1
PATCH 1/1 keepalived: fix systemd build with pkgconf 1.5.3
Hi Fabrice,
Quoted 6 lines · Fabrice Fontaine
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.alsa-utils uses the systemdsystemunitdir variable from systemd.pc to
alsa-utils?
Quoted 19 lines
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/34690fd724332c154971d5363a4c84e97a5e9ae9Signed-off-by Fabrice Fontaine <[email protected]>--- package/keepalived/keepalived.mk | 6 ++++++ 1 file changed, 6 insertions(+)package/keepalived/keepalived.mk +0
-0
package/keepalived/keepalived.mk else · line 55
Quoted 10 lines
package/keepalived/keepalived.mk +6
-0@@ -46,4 +46,10 @@ else KEEPALIVED_CONF_OPTS += --disable-libiptc endif +ifeq ($(BR2_INIT_SYSTEMD),y) +KEEPALIVED_CONF_OPTS += \ + --with-init=systemd \ + --with-systemdsystemunitdir=/usr/lib/systemd/system +endif + $(eval $(autotools-package))
baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -