From: Saul Wold <sgw@linux.intel.com>
Date: Sat, 9 Nov 2013 09:30:00 +0000 (+0200)
Subject: libcheck: upgrade to 0.9.11
X-Git-Tag: 2015-4~4582
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9982f9836f06b1a9282d657ee249eb08261518cb;p=openembedded-core.git

libcheck: upgrade to 0.9.11

Both patches have been merged upstream.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-support/libcheck/libcheck/ignore_automake_warning.patch b/meta/recipes-support/libcheck/libcheck/ignore_automake_warning.patch
deleted file mode 100644
index 51c5863f09..0000000000
--- a/meta/recipes-support/libcheck/libcheck/ignore_automake_warning.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd check-0.9.10/configure.ac check-0.9.10/configure.ac
---- check-0.9.10/configure.ac	2013-04-18 13:19:02.000000000 +0300
-+++ check-0.9.10/configure.ac	2013-10-25 00:26:43.102413363 +0300
-@@ -26,7 +26,7 @@
- AC_USE_SYSTEM_EXTENSIONS
-
- # really severe build strictness
--AM_INIT_AUTOMAKE([-Wall -Werror gnits 1.9.6])
-+AM_INIT_AUTOMAKE([-Wall gnits 1.9.6])
-
- # From patch 2803433, request system extensions to generate 64-bit safe code
- AC_USE_SYSTEM_EXTENSIONS
diff --git a/meta/recipes-support/libcheck/libcheck/libcheck_fix_for_automake-1.12.patch b/meta/recipes-support/libcheck/libcheck/libcheck_fix_for_automake-1.12.patch
deleted file mode 100644
index 263f6d6f0d..0000000000
--- a/meta/recipes-support/libcheck/libcheck/libcheck_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Upstream-Status: Pending
-
-This patch fixes following issue with automake 1.12
-
-| automake: warnings are treated as errors
-| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libcompat.la': linking libtool libraries using a non-POSIX
-| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2012/05/03
-
-Index: check-0.9.8/configure.ac
-===================================================================
---- check-0.9.8.orig/configure.ac
-+++ check-0.9.8/configure.ac
-@@ -103,6 +103,10 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_LIBTOOL
- 
-+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
-+
- # add these options to CFLAGS if the compiler supports them
- AC_DEFUN([AX_CFLAGS_ADD],[AX_C_CHECK_FLAG($1, , , CFLAGS="$CFLAGS $1")])
- AX_CFLAGS_WARN_ALL_ANSI
diff --git a/meta/recipes-support/libcheck/libcheck_0.9.10.bb b/meta/recipes-support/libcheck/libcheck_0.9.11.bb
similarity index 70%
rename from meta/recipes-support/libcheck/libcheck_0.9.10.bb
rename to meta/recipes-support/libcheck/libcheck_0.9.11.bb
index 05e49c7337..781b9508a1 100644
--- a/meta/recipes-support/libcheck/libcheck_0.9.10.bb
+++ b/meta/recipes-support/libcheck/libcheck_0.9.11.bb
@@ -6,12 +6,10 @@ LICENSE  = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz \
-           file://libcheck_fix_for_automake-1.12.patch \
-           file://ignore_automake_warning.patch \
           "
 
-SRC_URI[md5sum] = "6d10a8efb9a683467b92b3bce97aeb30"
-SRC_URI[sha256sum] = "823819235753e94ae0bcab3c46cc209de166c32ff2f52cefe120597db4403e6d"
+SRC_URI[md5sum] = "fd5a03979bcab9fb80ba005b55f54178"
+SRC_URI[sha256sum] = "ea4e8c7ffb00bb4ffb3f59f11744a71f1cc4212c79f3083c7d9a4b0953976936"
 
 S = "${WORKDIR}/check-${PV}"