fftw: add virtual/fftw to PROVIDES and EXCLUDE_FROM_WORLD

* now when sysroot conflicts are fatal we really don't want to build
  multiple fftw providers in the same sysroot

  ERROR: The recipe fftwl is trying to install files into a shared area
  when those files already exist. Those files and their manifest
  location are:
     /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/usr/include/fftw3.f
     Matched in
	manifest-qemuarm-fftw.populate_sysroot
	manifest-qemuarm-fftwf.populate_sysroot

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 8 insertions, 0 deletions

diff --git a/meta-oe/recipes-support/fftw/fftw.inc b/meta-oe/recipes-support/fftw/fftw.inc
index 6bd622d9b8..9007e1d828 100644
--- a/meta-oe/recipes-support/fftw/fftw.inc
+++ b/meta-oe/recipes-support/fftw/fftw.inc
@@ -3,6 +3,8 @@ SECTION = "libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
+PROVIDES = "virtual/fftw"
+
 RPROVIDES_${PN} += "libfftw3"
 
 SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz"
diff --git a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb
index 59f4a111f6..7a4fbac8c1 100644
--- a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb
+++ b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb
@@ -1,5 +1,8 @@
 require fftw.inc
 
+# conflicts with fftw and fftwl
+EXCLUDE_FROM_WORLD = "1"
+
 EXTRA_OECONF += "--enable-single \
     ${@base_contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \
 "
diff --git a/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb
index 8f37346596..432ff1241e 100644
--- a/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb
+++ b/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb
@@ -1,5 +1,8 @@
 require fftw.inc
 
+# conflicts with fftw and fftwf
+EXCLUDE_FROM_WORLD = "1"
+
 EXTRA_OECONF += "--enable-long-double"
 
 SRC_URI[md5sum] = "2edab8c06b24feeb3b82bbb3ebf3e7b3"