diff options
| author |   Ross Burton <ross.burton@intel.com> | 2014-01-20 22:45:01 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-21 10:48:25 +0000 |
| commit | 624e79deb58c08bcc32053e792df140f527d20b1 (patch) | |
| tree | d0ffabe64b7f968f41cfd23fed8f9befdd199f45 /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch | |
| parent | 992c054c0656efce50d3902b3f0b101ab9ea602a (diff) | |
| download | openembedded-core-contrib-624e79deb58c08bcc32053e792df140f527d20b1.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.
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/configure_fix.patch')
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch | 21 |
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 @@ -can sniff check buillds and runs an C binary, which breaks configure in -cross-compile environ. -This patch simple disables it. - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Upstream-Status: Inappropriate [embedded specific] - -Index: gdk-pixbuf-2.22.1/configure.ac -=================================================================== ---- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-25 16:26:41.000000000 +0800 -+++ gdk-pixbuf-2.22.1/configure.ac 2010-11-25 16:29:22.000000000 +0800 -@@ -99,6 +99,8 @@ - AC_MSG_CHECKING([for native Win32]) - LIB_EXE_MACHINE_FLAG=X86 - EXE_MANIFEST_ARCHITECTURE=X86 -+dnl disable can sniff check in cross compile -+gio_can_sniff=no - case "$host" in - *-*-mingw*) - os_win32=yes |