libmpc: upgraded to 1.0.1

License changed from LGPLv2 to LGPLv3.
The automake patch was integrated upstream in a different form.

(From OE-Core rev: 3e6d3ffee6d7a37981d22c2719dc5bd7aface9fb)

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 14 insertions, 43 deletions

diff --git a/meta/recipes-support/libmpc/libmpc.inc b/meta/recipes-support/libmpc/libmpc.inc
index 6e18e588be..0788dc261d 100644
--- a/meta/recipes-support/libmpc/libmpc.inc
+++ b/meta/recipes-support/libmpc/libmpc.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Mpc is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result. It is built upon and follows the same principles as Mpfr"
 HOMEPAGE = "http://www.multiprecision.org/"
-LICENSE = "LGPLv2"
+LICENSE = "LGPLv3"
 SECTION = "libs"
 
 inherit autotools
diff --git a/meta/recipes-support/libmpc/libmpc/libmpc_fix_for_automake-1.12.patch b/meta/recipes-support/libmpc/libmpc/libmpc_fix_for_automake-1.12.patch
deleted file mode 100644
index 75fa28e338..0000000000
--- a/meta/recipes-support/libmpc/libmpc/libmpc_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Upstream-Status: Pending
-
-this fix avoids this error 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: 'libmpc.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/02
-
-Index: mpc-0.8.2/configure.ac
-===================================================================
---- mpc-0.8.2.orig/configure.ac
-+++ mpc-0.8.2/configure.ac
-@@ -86,6 +86,10 @@ AC_PROG_EGREP
- AC_PROG_SED
- AC_LANG(C)
- 
-+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
-+
- dnl Check for GMP CFLAGS in gmp.h
- if test -z "$user_redefine_cc" ; then
-    MPC_GMP_CC_CFLAGS
diff --git a/meta/recipes-support/libmpc/libmpc_0.8.2.bb b/meta/recipes-support/libmpc/libmpc_0.8.2.bb
deleted file mode 100644
index 7a372bab68..0000000000
--- a/meta/recipes-support/libmpc/libmpc_0.8.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require libmpc.inc
-
-DEPENDS = "gmp mpfr"
-
-PR = "r1"
-LICENSE="LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
-SRC_URI = "http://www.multiprecision.org/mpc/download/mpc-${PV}.tar.gz \
-           file://libmpc_fix_for_automake-1.12.patch"
-
-SRC_URI[md5sum] = "e98267ebd5648a39f881d66797122fb6"
-SRC_URI[sha256sum] = "ae79f8d41d8a86456b68607e9ca398d00f8b7342d1d83bcf4428178ac45380c7"
-
-S = "${WORKDIR}/mpc-${PV}"
-BBCLASSEXTEND = "native nativesdk"
-
diff --git a/meta/recipes-support/libmpc/libmpc_1.0.1.bb b/meta/recipes-support/libmpc/libmpc_1.0.1.bb
new file mode 100644
index 0000000000..0b4766ca8b
--- /dev/null
+++ b/meta/recipes-support/libmpc/libmpc_1.0.1.bb
@@ -0,0 +1,13 @@
+require libmpc.inc
+
+DEPENDS = "gmp mpfr"
+
+LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02"
+SRC_URI = "http://www.multiprecision.org/mpc/download/mpc-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "b32a2e1a3daa392372fbd586d1ed3679"
+SRC_URI[sha256sum] = "ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff"
+
+S = "${WORKDIR}/mpc-${PV}"
+BBCLASSEXTEND = "native nativesdk"
+