diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-gnome/gtk+/files | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-gnome/gtk+/files')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch b/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch new file mode 100644 index 000000000..176e97998 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch @@ -0,0 +1,51 @@ +From 6914eccee34376f9067b0ee9f17039fe182125e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 31 Mar 2018 22:29:16 +0200 +Subject: [PATCH] do not build demos +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +They are not installed anyway and add libepoxy dependency + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + Makefile.am | 3 ++- + configure.ac | 3 --- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 984b6a7..6c754a6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -28,7 +28,8 @@ doc_subdirs = docs + else + doc_subdirs = + endif +-SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests demos $(doc_subdirs) ++ ++SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests $(doc_subdirs) + + gdkmm_includedir = $(includedir)/$(GDKMM_MODULE_NAME) + gdkmm_include_HEADERS = gdk/gdkmm.h +diff --git a/configure.ac b/configure.ac +index e5e82dc..c1c7658 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -109,11 +109,8 @@ AS_IF([test "x$gtkmm_enable_api_atkmm" != xno], + [GTKMM_MODULES="atkmm-1.6 >= 2.24.2 $GTKMM_MODULES"]) + AC_SUBST([GTKMM_MODULES]) + +-AC_SUBST([GTKMM_DEMOS_EXTRA_MODULES], ['epoxy >= 1.2']) +- + PKG_CHECK_MODULES([GDKMM], [$GDKMM_MODULES]) + PKG_CHECK_MODULES([GTKMM], [$GTKMM_MODULES]) +-PKG_CHECK_MODULES([GTKMM_DEMOS_EXTRA], [$GTKMM_DEMOS_EXTRA_MODULES]) + + MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0]) + MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0]) +-- +2.14.3 + |