check: upgrade to 0.9.8 and fix build with new automake-1.12.x

* configure_fix.patch and
  check-m4-am-path-check-use-quadrigraphs-in-macro-names-to-unbreak-autoconf.patch
  were already resolved upstream

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

5 files changed, 41 insertions, 49 deletions

diff --git a/meta-oe/recipes-support/check/check-0.9.8/fix.automake-1.12.x.patch b/meta-oe/recipes-support/check/check-0.9.8/fix.automake-1.12.x.patch
new file mode 100644
index 000000000..e11aabee1
--- /dev/null
+++ b/meta-oe/recipes-support/check/check-0.9.8/fix.automake-1.12.x.patch
@@ -0,0 +1,26 @@
+Fixes this error:
+
+| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libcompat.la': linking libtool libraries using a non-POSIX
+| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
+| lib/Makefile.am:3:   while processing Libtool library 'libcompat.la'
+| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libcheck.la': linking libtool libraries using a non-POSIX
+| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
+| src/Makefile.am:3:   while processing Libtool library 'libcheck.la'
+| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libcheckinternal.la': linking libtool libraries using a non-POSIX
+| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
+| src/Makefile.am:4:   while processing Libtool library 'libcheckinternal.la'
+| autoreconf: automake failed with exit status: 1
+
+Upstream-Status: Pending
+
+diff -uNr check-0.9.8.orig//configure.ac check-0.9.8/configure.ac
+--- check-0.9.8.orig//configure.ac      2009-09-23 12:50:08.000000000 +0200
++++ check-0.9.8/configure.ac    2012-07-19 17:43:51.000000000 +0200
+@@ -102,6 +102,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_LIBTOOL
++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")])
diff --git a/meta-oe/recipes-support/check/check_0.9.5.bb b/meta-oe/recipes-support/check/check_0.9.5.bb
deleted file mode 100644
index 2f1ae940a..000000000
--- a/meta-oe/recipes-support/check/check_0.9.5.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "a unit test framework for C"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1"
-SECTION = "devel"
-
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz \
-           file://configure_fix.patch \
-           file://check-m4-am-path-check-use-quadrigraphs-in-macro-names-to-unbreak-autoconf.patch \
-          "
-S = "${WORKDIR}/check-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF += "--enable-plain-docdir"
-
-SRC_URI[md5sum] = "30143c7974b547a12a7da47809a90951"
-SRC_URI[sha256sum] = "961b3c66869018d02226bbbc394e79362cd898962ce810bce8417b3c497f7ad6"
diff --git a/meta-oe/recipes-support/check/check_0.9.8.bb b/meta-oe/recipes-support/check/check_0.9.8.bb
new file mode 100644
index 000000000..ca79740ef
--- /dev/null
+++ b/meta-oe/recipes-support/check/check_0.9.8.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "a unit test framework for C"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1"
+SECTION = "devel"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz \
+           file://fix.automake-1.12.x.patch \
+          "
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF += "--enable-plain-docdir"
+
+SRC_URI[md5sum] = "5d75e9a6027cde79d2c339ef261e7470"
+SRC_URI[sha256sum] = "82acf956bb07584ffea2bf04d5989fe939c3e74ecf93133a21037fd0f7996a7f"
diff --git a/meta-oe/recipes-support/check/files/check-m4-am-path-check-use-quadrigraphs-in-macro-names-to-unbreak-autoconf.patch b/meta-oe/recipes-support/check/files/check-m4-am-path-check-use-quadrigraphs-in-macro-names-to-unbreak-autoconf.patch
deleted file mode 100644
index 61bdf1d42..000000000
--- a/meta-oe/recipes-support/check/files/check-m4-am-path-check-use-quadrigraphs-in-macro-names-to-unbreak-autoconf.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Imported from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=395466
-
--Khem
-Index: check-0.9.5/check.m4
-===================================================================
---- check-0.9.5.orig/check.m4
-+++ check-0.9.5/check.m4
-@@ -4,8 +4,8 @@ dnl
- 
- AC_DEFUN([AM_PATH_CHECK],
- [
--  AC_MSG_WARN([[AM_PATH_CHECK() is deprecated]])
--  AC_MSG_WARN([[use PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead]])
-+  AC_MSG_WARN([A@&t@M_PATH_CHECK() is deprecated])
-+  AC_MSG_WARN([[use P@&t@KG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead]])
-   AC_ARG_WITH([check],
-   [  --with-check=PATH       prefix where check is installed [default=auto]])
-  
diff --git a/meta-oe/recipes-support/check/files/configure_fix.patch b/meta-oe/recipes-support/check/files/configure_fix.patch
deleted file mode 100644
index 3e79319d8..000000000
--- a/meta-oe/recipes-support/check/files/configure_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: check-0.9.5/configure.ac
-===================================================================
---- check-0.9.5.orig/configure.ac       2008-10-29 04:09:50.000000000 +0000
-+++ check-0.9.5/configure.ac    2008-10-29 04:10:06.000000000 +0000
-@@ -71,6 +71,7 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_LIBTOOL
-+AM_PROG_CC_C_O
- if test -n "$GCC"; then
-   CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings"
- fi