diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch')
-rw-r--r-- | yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch | 105 |
1 files changed, 0 insertions, 105 deletions
diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch deleted file mode 100644 index c4edff395..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 483a4bb00e7dd2f14d86e167c8013c8638723c33 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <ebassi@gnome.org> -Date: Thu, 18 Feb 2016 17:19:09 +0000 -Subject: [PATCH] build: Use AC_COMPILE_IFELSE - -Instead of AC_TRY_COMPILE, which has been deprecated by newer autoconf. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - configure.ac | 66 ++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 33 insertions(+), 33 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4d72e0c..8ca3f94 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -348,24 +348,25 @@ AS_IF([test "x$enable_wayland" != xno], - # We need to manually check for Wayland support in Cogl because - # the windowing systems are not exposed in the pkg-config file - saved_CFLAGS="${CFLAGS}" -- CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" -+ CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`" - - AC_MSG_CHECKING([for Wayland Cogl backend]) -- AC_TRY_COMPILE([#include <cogl/cogl.h>], -- [ -- #ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT -- #error "No Wayland support in Cogl" -- #endif -- int main (void) { return 0; } -- ], -- [ -- AC_MSG_RESULT(yes) -- have_cogl_wayland=yes -- ], -- [ -- AC_MSG_RESULT(no) -- have_cogl_wayland=no -- ]) -+ -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+#include <cogl/cogl.h> -+]], -+[[ -+#ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT -+#error Cogl compiled without Wayland support -+#endif -+]])], [ -+ AC_MSG_RESULT(yes) -+ have_cogl_wayland=yes -+ ], [ -+ AC_MSG_RESULT(no) -+ have_cogl_wayland=no -+ ]) -+ - CFLAGS="${saved_CFLAGS}" - AS_IF([test "x$have_cogl_wayland" = xyes], - [ -@@ -499,26 +500,25 @@ AS_IF([test "x$enable_mir" = "xyes"], - # We need to manually check for Mir support in Cogl because - # the windowing systems are not exposed in the pkg-config file - saved_CFLAGS="${CFLAGS}" -- CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" -+ CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`" - - AC_MSG_CHECKING([for Mir Cogl backend]) -- AC_TRY_COMPILE([#include <cogl/cogl.h>], -- [ -- #ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT -- #error "No Mir support in Cogl" -- #endif -- int main (void) { return 0; } -- ], -- [ -- AC_MSG_RESULT(yes) -- have_cogl_mir=yes -- ], -- [ -- AC_MSG_RESULT(no) -- have_cogl_mir=no -- ]) - -- CFLAGS="${saved_CFLAGS}" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+#include <cogl/cogl.h> -+]], -+[[ -+#ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT -+#error Cogl compiled without Mir support -+#endif -+]])], [ -+ AC_MSG_RESULT(yes) -+ have_cogl_mir=yes -+ ], [ -+ AC_MSG_RESULT(no) -+ have_cogl_mir=no -+ ]) -+ - AS_IF([test "x$have_cogl_mir" = xno], [AC_MSG_ERROR("*** Cogl is missing Mir support.")]) - - PKG_CHECK_EXISTS([mirclient], --- -1.9.1 - |