fftw: fix license checksums and delete old versions

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

4 files changed, 3 insertions, 27 deletions

diff --git a/meta-oe/recipes-support/fftw/fftw.inc b/meta-oe/recipes-support/fftw/fftw.inc
index 40608b61d..a71b7e1de 100644
--- a/meta-oe/recipes-support/fftw/fftw.inc
+++ b/meta-oe/recipes-support/fftw/fftw.inc
@@ -1,10 +1,10 @@
 DESCRIPTION = "FFTW"
 SECTION = "libs"
 PRIORITY = "optional"
-LICENSE = "GPL"
-RPROVIDES_${PN} += "libfftw3"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-PR = "r3"
+RPROVIDES_${PN} += "libfftw3"
 
 SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz"
 
@@ -17,7 +17,6 @@ do_configure_prepend() {
 }
 
 PACKAGES =+ "lib${PN}"
-
 FILES_lib${PN} = "${libdir}/lib*.so.*"
 
 # rename binary in /bin and use u-a tpo choose between different precision implementations?
diff --git a/meta-oe/recipes-support/fftw/fftw_3.1.2.bb b/meta-oe/recipes-support/fftw/fftw_3.1.2.bb
deleted file mode 100644
index da8133785..000000000
--- a/meta-oe/recipes-support/fftw/fftw_3.1.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require fftw.inc
-
-EXTRA_OECONF = "--disable-fortran --enable-shared"
-
-
-
-SRC_URI[md5sum] = "08f2e21c9fd02f4be2bd53a62592afa4"
-SRC_URI[sha256sum] = "e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf"
diff --git a/meta-oe/recipes-support/fftw/fftwf_3.1.2.bb b/meta-oe/recipes-support/fftw/fftwf_3.1.2.bb
deleted file mode 100644
index a4f246652..000000000
--- a/meta-oe/recipes-support/fftw/fftwf_3.1.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require fftw.inc
-
-EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared"
-
-
-SRC_URI[md5sum] = "08f2e21c9fd02f4be2bd53a62592afa4"
-SRC_URI[sha256sum] = "e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf"
diff --git a/meta-oe/recipes-support/fftw/fftwl_3.1.2.bb b/meta-oe/recipes-support/fftw/fftwl_3.1.2.bb
deleted file mode 100644
index 69256fb9f..000000000
--- a/meta-oe/recipes-support/fftw/fftwl_3.1.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require fftw.inc
-
-EXTRA_OECONF = "--disable-fortran --enable-long-double --enable-shared"
-
-
-
-SRC_URI[md5sum] = "08f2e21c9fd02f4be2bd53a62592afa4"
-SRC_URI[sha256sum] = "e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf"