ccid: fix build with pkgconf 1.5.3
PATCH v2 1/1 ccid: 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.
ccid uses the usbdropdir variable from libpcsclite.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 libpcsclite.pc.
Fixes:
- http://autobuild.buildroot.org/results/4d4c1ba7f5d00d1b927ac01ef9851468abfbdff2
---
Changes v1 -> v2 (after review of Arnout Vandecappelle):
- Drop patch to remove DESTDIR and use --enable-usbdropdir
package/ccid/ccid.mk | 1 + 1 file changed, 1 insertion(+)
package/ccid/ccid.mk +1 -0
@@ -11,6 +11,7 @@ CCID_LICENSE = LGPL-2.1+ CCID_LICENSE_FILES = COPYING CCID_INSTALL_STAGING = YES CCID_DEPENDENCIES = pcsc-lite host-pkgconf libusb +CCID_CONF_OPTS = --enable-usbdropdir=/usr/lib/pcsc/drivers ifeq ($(BR2_PACKAGE_HAS_UDEV),y) define CCID_INSTALL_UDEV_RULES
Signature · 1 line
2.14.1
PATCH v2 1/1 ccid: fix build with pkgconf 1.5.3
Hello Fabrice,
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.ccid uses the usbdropdir variable from libpcsclite.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 libpcsclite.pc.
Quoted 7 lines
Fixes:
- http://autobuild.buildroot.org/results/4d4c1ba7f5d00d1b927ac01ef9851468abfbdff2Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2 (after review of Arnout Vandecappelle):
- Drop patch to remove DESTDIR and use --enable-usbdropdir
Applied to master, thanks. I'd like to take this opportunity to thank a lot for the work you've done on fixing the fallouts/consequences of the pkg-config 1.5.3, which I authored and committed. I have been busy the last few evenings, and couldn't help much with that, so I'm glad you've been here to help with this. Many thanks for that.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com