Skip to contentSkip to conversation

iwd: fix dbus build with pkgconf 1.5.3

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

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/1 iwd: fix dbus 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.

iwd uses the datadir variable from dbus-1.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 usbdropdir to use explicitly instead of relying on dbus-1.pc.

Fixes:
- http://autobuild.buildroot.org/results/2b9e28264248f073cc9973bd4c7a89363ec9c0c3

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/iwd/iwd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/iwd/iwd.mk +1 -1
index 2ff8f88cf8..1cfc05be41 100644
@@ -22,7 +22,7 @@ endef
 IWD_POST_PATCH_HOOKS += IWD_MKDIR_BUILD_AUX
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
-IWD_CONF_OPTS += --enable-dbus-policy
+IWD_CONF_OPTS += --enable-dbus-policy --with-dbus-datadir=/usr/share
 IWD_DEPENDENCIES += dbus
 else
 IWD_CONF_OPTS += --disable-dbus-policy
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH 1/1 iwd: fix dbus build with pkgconf 1.5.3

Hello,

Quoted 12 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.

iwd uses the datadir variable from dbus-1.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 usbdropdir to use explicitly instead of relying on dbus-1.pc.

Quoted 7 lines

Fixes:
- http://autobuild.buildroot.org/results/2b9e28264248f073cc9973bd4c7a89363ec9c0c3

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/iwd/iwd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

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