diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-01-30 22:07:18 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-02 10:41:26 +0100 |
| commit | 2c07341c751e88a2b6f47ddf630b26d5ca552345 (patch) | |
| tree | 82926f415abfdb3ba18af1aa25d21223fe444832 | |
| parent | aa8eea6c37b8021ce1d53f9cd90dd3c373b19c88 (diff) | |
| download | buildroot-2c07341c751e88a2b6f47ddf630b26d5ca552345.tar.gz buildroot-2c07341c751e88a2b6f47ddf630b26d5ca552345.zip | |
package/wayland: build a host variant
Starting with 1.4.0, weston requires wayland-scanner to build its DT.
So far, we got away with just hand-building wayland-scanner, and made
that available in HOST_DIR/usr/bin
But now, weston also requires wayland's DTD, which we did not take care of
in our dirty little hack.
So, the best solution is to just build a host-variant of wayland, so
we get both wayland-scanner, and the DTD.
But then, we do not build the target wayland-scanner (he, wayland tries
to run it at build time...). So it is a matter of just tweaking a little
bit the host .pc file (which weston uses to find wayland-scanner, sigh...)
and fake it as a target .pc file.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/wayland/wayland.mk | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk index a823d2b761..3ab94ca30c 100644 --- a/package/wayland/wayland.mk +++ b/package/wayland/wayland.mk @@ -11,22 +11,27 @@ WAYLAND_LICENSE = MIT WAYLAND_LICENSE_FILES = COPYING WAYLAND_INSTALL_STAGING = YES -WAYLAND_DEPENDENCIES = libffi host-pkgconf expat host-expat +WAYLAND_DEPENDENCIES = libffi host-pkgconf host-wayland expat -# wayland needs a wayland-scanner program to generate some of its -# source code. By default, it builds it with CC, so it doesn't work with -# cross-compilation. Therefore, we build it manually, and tell wayland -# that the tool is already available. +# wayland-scanner is only needed for building, not on the target WAYLAND_CONF_OPT = --disable-scanner -define WAYLAND_BUILD_SCANNER - (cd $(@D)/src/; \ - $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ - -o wayland-scanner scanner.c wayland-util.c -lexpat; \ - $(INSTALL) -m 0755 -D wayland-scanner \ - $(HOST_DIR)/usr/bin/wayland-scanner) +# We must provide a specialy-crafted wayland-scanner .pc file +# which we vampirise and adapt from the host-wayland copy +define WAYLAND_SCANNER_PC + $(INSTALL) -m 0644 -D $(HOST_DIR)/usr/share/pkgconfig/wayland-scanner.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc + $(SED) 's:^prefix=.*:prefix=/usr:' \ + -e 's:^wayland_scanner=.*:wayland_scanner=$(HOST_DIR)/usr/bin/wayland-scanner:' \ + $(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc endef +WAYLAND_POST_INSTALL_STAGING_HOOKS += WAYLAND_SCANNER_PC -WAYLAND_POST_CONFIGURE_HOOKS += WAYLAND_BUILD_SCANNER +# Remove the DTD from the target, it's not needed at runtime +define WAYLAND_TARGET_CLEANUP + rm -rf $(TARGET_DIR)/usr/share/wayland +endef +WAYLAND_POST_INSTALL_TARGET_HOOKS += WAYLAND_TARGET_CLEANUP $(eval $(autotools-package)) +$(eval $(host-autotools-package)) |
