CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fftw: add virtual/fftw to PROVIDES and EXCLUDE_FROM_WORLD

Browse Source 
* 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>
This commit is contained in:
Martin Jansa 2014-10-03 04:28:30 +02:00
parent 7f0bf7279d
commit d93c096519
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-oe/recipes-support/fftw/fftw.inc
View File

@ -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"

3
meta-oe/recipes-support/fftw/fftwf_3.3.4.bb
View File

@ -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)} \
"

3
meta-oe/recipes-support/fftw/fftwl_3.3.4.bb
View File

@ -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"

2
meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb
View File

@ -3,7 +3,7 @@ SECTION = "console/utils"
LICENSE = "ImageMagick"
LIC_FILES_CHKSUM = "file://LICENSE;md5=5d84c6ddd4028aa53d028b4c50f9361e"
# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw freetype"
DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib virtual/fftw freetype"
PATCHSET = "8"
SRC_URI = "http://www.imagemagick.org/download/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \

2
meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb
View File

@ -3,7 +3,7 @@ SECTION = "libs"
LICENSE = "GPLv2"
# single precision fftw is called fftwf
DEPENDS = "fftwf"
DEPENDS = "virtual/fftw"
SRC_URI = "http://www.fftw.org/benchfft/benchfft-${PV}.tar.gz"