summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/sysprof
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/sysprof')
-rw-r--r--meta/recipes-kernel/sysprof/files/gui-argument.patch35
-rw-r--r--meta/recipes-kernel/sysprof/sysprof_git.bb9
2 files changed, 41 insertions, 3 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 @@
1Add the ability to explicitly enable/disable GUI support
2
3Signed-off-by: Christopher Larson <chris_larson@mentor.com>
4Upstream-Status: Pending
5
6--- git.orig/configure.ac
7+++ git/configure.ac
8@@ -62,12 +62,24 @@ KMICRO=`uname -r | cut -d"." -f 3 | cut
9 # Pkgconfig dependencies
10
11 core_dep="glib-2.0 >= 2.6.0"
12-gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
13
14 PKG_CHECK_MODULES(CORE_DEP, $core_dep, [], AC_MSG_ERROR([sysprof dependencies not satisfied]))
15
16-build_gui=yes
17-PKG_CHECK_MODULES(GUI_DEP, $gui_dep, [], build_gui=no)
18+gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
19+
20+AC_ARG_ENABLE([gui],
21+ [AS_HELP_STRING([--disable-gui],
22+ [Disable GUI functionality (requires gtk+, gdk-pixbuf, pangoft2, libglade) @<:@default=auto@:>@])],
23+ [],
24+ [enable_gui=auto])
25+
26+build_gui=no
27+AS_IF([test "x$enable_gui" != xno],
28+ [PKG_CHECK_MODULES(GUI_DEP, $gui_dep, build_gui=yes,
29+ [if test "x$enable_gui" != xauto; then
30+ AC_MSG_FAILURE(
31+ [--enable-gui was given, but gui dependencies were not satisfied])
32+ fi])])
33
34 AM_CONDITIONAL([BUILD_GUI], [test "$build_gui" = yes])
35
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index 7d87efe7db..84c6aad39e 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -2,13 +2,14 @@ SUMMARY = "System-wide Performance Profiler for Linux"
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4 4
5DEPENDS = "gtk+ libglade" 5DEPENDS = "glib-2.0"
6 6
7SRCREV = "cd44ee6644c3641507fb53b8a2a69137f2971219" 7SRCREV = "cd44ee6644c3641507fb53b8a2a69137f2971219"
8PV = "1.2.0+git${SRCPV}" 8PV = "1.2.0+git${SRCPV}"
9 9
10SRC_URI = "git://git.gnome.org/sysprof \ 10SRC_URI = "git://git.gnome.org/sysprof \
11 file://define-NT_GNU_BUILD_ID.patch \ 11 file://define-NT_GNU_BUILD_ID.patch \
12 file://gui-argument.patch \
12 " 13 "
13 14
14SRC_URI_append_arm = " file://rmb-arm.patch" 15SRC_URI_append_arm = " file://rmb-arm.patch"
@@ -19,8 +20,10 @@ SRC_URI_append_mips64n32 = " file://rmb-mips.patch"
19 20
20S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
21 22
22inherit autotools pkgconfig distro_features_check 23inherit autotools pkgconfig
23ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" 24
25PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK2DISTROFEATURES}', 'gui', '', d)}"
26PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,gtk+ gdk-pixbuf pango libglade"
24 27
25# We do not yet work for aarch64. 28# We do not yet work for aarch64.
26# 29#