summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch')
-rw-r--r--meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch b/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
deleted file mode 100644
index 6cc0f3bfc1..0000000000
--- a/meta/recipes-graphics/wayland/wayland-protocols/dont-use-AC_CANONICAL.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Check autoconfs $cross_compiling instead as AC_CANONICAL_HOST call
2will fail if the host cpu is not recognised (which can happen when
3e.g. Yocto builds for "allarch").
4
5Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
6Upstream-Status: Backport [cc276dfa41]
7
8diff --git a/configure.ac b/configure.ac
9index 5b48b1a..3d45a4b 100644
10--- a/configure.ac
11+++ b/configure.ac
12@@ -15,13 +15,10 @@ AC_CONFIG_MACRO_DIR([m4])
13
14 AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version])
15
16-AC_CANONICAL_HOST
17-AC_CANONICAL_BUILD
18-
19 AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable])
20 AC_PATH_PROG([wayland_scanner], [wayland-scanner])
21 if test x$wayland_scanner = x; then
22- if test x$host = x$build; then
23+ if test "x$cross_compiling" != "xyes"; then
24 PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
25 wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
26 else
27--
28cgit v0.10.2
29