diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-03 04:28:30 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-06 01:07:53 +0200 |
commit | d93c0965190ef0e80cd61eeb69309f6879826452 (patch) | |
tree | cc37ec063cd356156da766f3bb546daf45c82aa7 /meta-oe/recipes-support/imagemagick | |
parent | 7f0bf7279da8aa613e0d92e28b0e3deff7b19173 (diff) | |
download | meta-openembedded-d93c0965190ef0e80cd61eeb69309f6879826452.tar.gz |
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>
Diffstat (limited to 'meta-oe/recipes-support/imagemagick')
-rw-r--r-- | meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb index 9b15f62f21..454db64a93 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb | |||
@@ -3,7 +3,7 @@ SECTION = "console/utils" | |||
3 | LICENSE = "ImageMagick" | 3 | LICENSE = "ImageMagick" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5d84c6ddd4028aa53d028b4c50f9361e" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5d84c6ddd4028aa53d028b4c50f9361e" |
5 | # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. | 5 | # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. |
6 | DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw freetype" | 6 | DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib virtual/fftw freetype" |
7 | 7 | ||
8 | PATCHSET = "8" | 8 | PATCHSET = "8" |
9 | SRC_URI = "http://www.imagemagick.org/download/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ | 9 | SRC_URI = "http://www.imagemagick.org/download/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ |