summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-01-20 22:45:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-22 07:20:03 +0000
commit1e162c09d253eb3b02510bd1d48c298d6057ec1b (patch)
treec11fce59a58de9cb7ade794e2ed96efcd50e36cd /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf
parentd59809c51155c6fccf5ae58c1723be85bf95de05 (diff)
downloadpoky-1e162c09d253eb3b02510bd1d48c298d6057ec1b.tar.gz
gdk-pixbuf: don't forcibly disable GIO sniffing, use PACKAGECONFIG.
There's a configure option for GIO sniffing so don't use a patch to disable it. Instead use a PACKAGECONFIG for this and default to off, as using GIO for sniffing means a hard dependency on shared-mime-info. (From OE-Core rev: 624e79deb58c08bcc32053e792df140f527d20b1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch21
1 files changed, 0 insertions, 21 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch
deleted file mode 100644
index b141690387..0000000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1can sniff check buillds and runs an C binary, which breaks configure in
2cross-compile environ.
3This patch simple disables it.
4
5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
6
7Upstream-Status: Inappropriate [embedded specific]
8
9Index: gdk-pixbuf-2.22.1/configure.ac
10===================================================================
11--- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-25 16:26:41.000000000 +0800
12+++ gdk-pixbuf-2.22.1/configure.ac 2010-11-25 16:29:22.000000000 +0800
13@@ -99,6 +99,8 @@
14 AC_MSG_CHECKING([for native Win32])
15 LIB_EXE_MACHINE_FLAG=X86
16 EXE_MANIFEST_ARCHITECTURE=X86
17+dnl disable can sniff check in cross compile
18+gio_can_sniff=no
19 case "$host" in
20 *-*-mingw*)
21 os_win32=yes