diff options
author | 2017-02-27 10:46:50 +0100 | |
---|---|---|
committer | 2017-05-03 11:10:04 +0200 | |
commit | 10d0d2392d64bed9aee6f81818390ea5ddd54082 (patch) | |
tree | 933fe42b414244263fc7fa399e45bedca6482e47 /meta-rcar-gen3/recipes-forward-port/wayland_fp_morty/weston/0001-configure.ac-Fix-wayland-protocols-path.patch | |
parent | 6bcdb8b084a45f5526a75bc10aae641da7bbcd73 (diff) |
[COMMUNITY] cleaned wayland recipes to facilitate maintenance
* move wayland forward port into directory :
recipes-forward-port/wayland_fp_morty
* move renesas fix on forward port into directory :
recipes-forward-port/wayland
* weston recipes bbappend do not overwrite SRC_URI,
replace SRC_URI softly (Easier to maintain).
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-rcar-gen3/recipes-forward-port/wayland_fp_morty/weston/0001-configure.ac-Fix-wayland-protocols-path.patch')
-rw-r--r-- | meta-rcar-gen3/recipes-forward-port/wayland_fp_morty/weston/0001-configure.ac-Fix-wayland-protocols-path.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta-rcar-gen3/recipes-forward-port/wayland_fp_morty/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta-rcar-gen3/recipes-forward-port/wayland_fp_morty/weston/0001-configure.ac-Fix-wayland-protocols-path.patch new file mode 100644 index 0000000..00118d7 --- /dev/null +++ b/meta-rcar-gen3/recipes-forward-port/wayland_fp_morty/weston/0001-configure.ac-Fix-wayland-protocols-path.patch @@ -0,0 +1,34 @@ +From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Wed, 11 May 2016 16:16:30 +0300 +Subject: [PATCH] configure.ac: Fix wayland-protocols path + +The wayland-protocols directory is used during build: Fix the path +to point to sysroot specified in recipe. + +Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that +breaks multilib weston as it would point to multilib sysroot when the +(allarch) wayland-protocols is actually in the machine sysroot. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Inappropriate [embedded specific] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index bc7c329..15a05d3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0]) + PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) + + PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2], +- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) ++ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) + + AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, +-- +2.1.4 + |