Skip to contentSkip to conversation

bluez5_utils: fix 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 bluez5_utils: fix 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.

bluez5_utils uses the sysconfdir 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 sysconfdir to use explicitly instead of relying on dbus-1.pc.

Fixes:
- http://autobuild.buildroot.org/results/498e7e368fbb3d69c2f311e3e5bc213e507b8023

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/bluez5_utils/bluez5_utils.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/bluez5_utils/bluez5_utils.mk +2 -1
index f5b827cc30..15c9b670a7 100644
@@ -20,7 +20,8 @@ BLUEZ5_UTILS_DEPENDENCIES = \
 BLUEZ5_UTILS_CONF_OPTS = \
 	--enable-tools \
 	--enable-library \
-	--disable-cups
+	--disable-cups \
+	--with-dbusconfdir=/etc
 
 ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-obex
Signature · 1 line
2.14.1
Applied
#1 lore raw

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

bluez5_utils uses the sysconfdir 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 sysconfdir to use explicitly instead of relying on dbus-1.pc.

Quoted 7 lines

Fixes:
- http://autobuild.buildroot.org/results/498e7e368fbb3d69c2f311e3e5bc213e507b8023

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

Applied to master, thanks.

Thomas

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