aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-22 17:26:41 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-22 17:26:41 +0100
commit0b7ada555863cc6c9b558fd6f93a182fa32a2101 (patch)
treeecd45eda3fb52c622d7007f5890263c0e27971cd
parentee58353462f32f46f3f5b93f6dc78e94b31bad78 (diff)
downloadbuildroot-0b7ada555863cc6c9b558fd6f93a182fa32a2101.tar.gz
buildroot-0b7ada555863cc6c9b558fd6f93a182fa32a2101.tar.bz2
Revert "package/x11r7/xcb-proto: remove pkgconf fix"
This reverts commit 598cd3dc55dfd805de0fa7416062ee3c4a063402, following the modification of the pkg-config behavior to be like it used to be. Fixes: http://autobuild.buildroot.net/results/41a4e6b9e17adc75b023e89b231a2e00e3484979/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/x11r7/xcb-proto/xcb-proto.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index bf09cb6b07..b85dad7f2c 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -15,5 +15,15 @@ XCB_PROTO_INSTALL_STAGING = YES
XCB_PROTO_DEPENDENCIES = host-python
HOST_XCB_PROTO_DEPENDENCIES = host-python
+# xcbincludedir/pythondir is used by E.G. libxcb at build time to find the
+# xml / python files, so ensure these expand to their full (host) paths
+define XCB_PROTO_FIXUP_PC_FILE
+ $(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_DIR)|' \
+ -e 's|^\(pythondir=\)|\1$(STAGING_DIR)|' \
+ $(STAGING_DIR)/usr/lib/pkgconfig/xcb-proto.pc
+endef
+
+XCB_PROTO_POST_INSTALL_STAGING_HOOKS += XCB_PROTO_FIXUP_PC_FILE
+
$(eval $(autotools-package))
$(eval $(host-autotools-package))