summaryrefslogtreecommitdiff
path: root/meta/recipes-kernel/sysprof/files
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2015-11-11 11:35:06 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-25 08:07:53 +0000
commit191a1817c9dce90f3094bc98d6e0f5ab02f8a5c7 (patch)
tree6b3626221f971bf782df4e957d8a68cbcbaf5232 /meta/recipes-kernel/sysprof/files
parent35c5ab8f34400000129078e1a5246232b20fd265 (diff)
downloadopenembedded-core-191a1817c9dce90f3094bc98d6e0f5ab02f8a5c7.tar.gz
openembedded-core-191a1817c9dce90f3094bc98d6e0f5ab02f8a5c7.tar.bz2
openembedded-core-191a1817c9dce90f3094bc98d6e0f5ab02f8a5c7.zip
sysprof: use packageconfig for the gui
This makes the gtk dependencies optional. Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-kernel/sysprof/files')
-rw-r--r--meta/recipes-kernel/sysprof/files/gui-argument.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-kernel/sysprof/files/gui-argument.patch b/meta/recipes-kernel/sysprof/files/gui-argument.patch
new file mode 100644
index 0000000000..d2c053e689
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/gui-argument.patch
@@ -0,0 +1,35 @@
+Add the ability to explicitly enable/disable GUI support
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Upstream-Status: Pending
+
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -62,12 +62,24 @@ KMICRO=`uname -r | cut -d"." -f 3 | cut
+ # Pkgconfig dependencies
+
+ core_dep="glib-2.0 >= 2.6.0"
+-gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
+
+ PKG_CHECK_MODULES(CORE_DEP, $core_dep, [], AC_MSG_ERROR([sysprof dependencies not satisfied]))
+
+-build_gui=yes
+-PKG_CHECK_MODULES(GUI_DEP, $gui_dep, [], build_gui=no)
++gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
++
++AC_ARG_ENABLE([gui],
++ [AS_HELP_STRING([--disable-gui],
++ [Disable GUI functionality (requires gtk+, gdk-pixbuf, pangoft2, libglade) @<:@default=auto@:>@])],
++ [],
++ [enable_gui=auto])
++
++build_gui=no
++AS_IF([test "x$enable_gui" != xno],
++ [PKG_CHECK_MODULES(GUI_DEP, $gui_dep, build_gui=yes,
++ [if test "x$enable_gui" != xauto; then
++ AC_MSG_FAILURE(
++ [--enable-gui was given, but gui dependencies were not satisfied])
++ fi])])
+
+ AM_CONDITIONAL([BUILD_GUI], [test "$build_gui" = yes])
+