diff options
author | Samuel Stirtzel <s.stirtzel@googlemail.com> | 2012-10-22 15:13:28 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-10-23 08:43:15 +0200 |
commit | 662fd013adcbee8c59f4f475a11911c3267eae90 (patch) | |
tree | 229e15ea6ea1151f02ca6376ea0e61ef23400408 /meta-oe/recipes-core | |
parent | fb368b0790a2804080f28b75cf27dcffde763c37 (diff) | |
download | meta-openembedded-662fd013adcbee8c59f4f475a11911c3267eae90.tar.gz |
libjpeg-turbo: Add RPROVIDES to fix errors when rdepending on jpeg
This fixes "ERROR: Multiple .bb files are due to be built which each provide jpeg"
Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
Acked-by: Chase Maupin <chase.maupin@ti.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r-- | meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb index 2aefe1fce..d87743b72 100644 --- a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb +++ b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=78fa8dbac547bb5b2a0e6457a6cfe | |||
7 | file://djpeg.c;endline=13;md5=e85613b52f2906c5dfc0e21ec902cb33 \ | 7 | file://djpeg.c;endline=13;md5=e85613b52f2906c5dfc0e21ec902cb33 \ |
8 | " | 8 | " |
9 | PV = "8d+1.2.1" | 9 | PV = "8d+1.2.1" |
10 | PR = "r1" | 10 | PR = "r2" |
11 | SRCREV = "837" | 11 | SRCREV = "837" |
12 | SRC_URI = "svn://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo;protocol=https;module=trunk" | 12 | SRC_URI = "svn://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo;protocol=https;module=trunk" |
13 | 13 | ||
@@ -15,6 +15,9 @@ S = "${WORKDIR}/trunk" | |||
15 | 15 | ||
16 | # Drop-in replacement for jpeg | 16 | # Drop-in replacement for jpeg |
17 | PROVIDES = "jpeg" | 17 | PROVIDES = "jpeg" |
18 | RPROVIDES_${PN} += "jpeg" | ||
19 | RREPLACES_${PN} += "jpeg" | ||
20 | RCONFLICTS_${PN} += "jpeg" | ||
18 | 21 | ||
19 | inherit autotools pkgconfig | 22 | inherit autotools pkgconfig |
20 | 23 | ||