diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-04 12:49:28 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 18:05:24 +0100 |
commit | dda59ddc1c123b8bcfcbc76a41cedf7bb9bf0490 (patch) | |
tree | d2726405774a0adc75c4a53ed8fff0647a94d2f5 /meta/recipes-kernel/sysprof/files/gui-argument.patch | |
parent | c0725452d5d299f4ee7409cf2337ef8b8044fb70 (diff) | |
download | poky-dda59ddc1c123b8bcfcbc76a41cedf7bb9bf0490.tar.gz |
sysprof: Upgrade to git version slightly past 3.20
New version uses Gtk+3. 3.20 release requires a bunch of fixes to
build without polkit, this git revision inclues those fixes.
* Add patch to use proper U64_TO_POINTER macro to fix build on
32 bit platforms.
* Forward port memory barrier patches for arm & mips
* sysprof builds with loads of warnings and git builds also use
-Werror: avoid that by setting "--enable-compile-warnings"
(From OE-Core rev: ab2d5e397d30999929108c9d929767205fee9db4)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/sysprof/files/gui-argument.patch')
-rw-r--r-- | meta/recipes-kernel/sysprof/files/gui-argument.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-kernel/sysprof/files/gui-argument.patch b/meta/recipes-kernel/sysprof/files/gui-argument.patch deleted file mode 100644 index d2c053e689..0000000000 --- a/meta/recipes-kernel/sysprof/files/gui-argument.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Add the ability to explicitly enable/disable GUI support | ||
2 | |||
3 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
4 | Upstream-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 | |||