summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-10-20 19:30:27 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-10-21 11:44:28 +0200
commitd29cd80972c115fcb50e3b5421060a07e7e1f5a4 (patch)
treee2e374f3e632e76d9bbcef9919cccab85c6a9751
parent26c7c65fe24834eb3d3a98e9cb5b0a554ea3af4f (diff)
downloadptxdist-d29cd80972c115fcb50e3b5421060a07e7e1f5a4.tar.gz
ptxdist-d29cd80972c115fcb50e3b5421060a07e7e1f5a4.tar.xz
wayland: don't install target wayland-scanner to sysroot
Some packages, such as xorg-server look for wayland-scanner next to the client libraries by default. Make sure it's not there, so that wayland-scanner from sysroot-host is found instead. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/wayland.make2
1 files changed, 2 insertions, 0 deletions
diff --git a/rules/wayland.make b/rules/wayland.make
index cb4832f97..b7ffe3379 100644
--- a/rules/wayland.make
+++ b/rules/wayland.make
@@ -47,6 +47,8 @@ WAYLAND_CONF_OPT := \
$(STATEDIR)/wayland.install.post:
@$(call targetinfo)
+# # target wayland-scanner is not needed. Make sure nobody tries to use it
+ @rm -f $(WAYLAND_PKGDIR)/usr/bin/wayland-scanner
@$(call world/install.post, WAYLAND)
@sed 's;^prefix=.*;prefix=$(PTXDIST_SYSROOT_HOST);' \
$(PTXDIST_SYSROOT_HOST)/lib/pkgconfig/wayland-scanner.pc \