diff options
author | Maxin B. John <maxin.john@intel.com> | 2016-09-08 18:46:54 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-14 22:22:07 +0100 |
commit | 6b889ff46e1958919deb37421ef7fd4ca10eedb2 (patch) | |
tree | 66e483d9f5c18c7c63aa6bfc1a39518ee9755742 /meta/recipes-support/libical/libical_2.0.0.bb | |
parent | 25468b58a5302355ac836ac33bfdea950bcc519f (diff) | |
download | poky-6b889ff46e1958919deb37421ef7fd4ca10eedb2.tar.gz |
libical: fix build failure after changing machine
libical build QA fails when libical is built for e.g. qemux86-64 already, and
is then built for generic86-64 in a way that install is re-run:
$ MACHINE=qemux86-64 bitbake libical
$ MACHINE=genericx86-64 bitbake -f -Cinstall libical
ERROR: libical-2.0.0-r0 do_populate_sysroot: QA Issue: libical.pc failed
sanity test (tmpdir) in path
[YOCTO #10223]
(From OE-Core rev: 0445e68fdbbba5c4efb6422c89ee864e4273b114)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libical/libical_2.0.0.bb')
-rw-r--r-- | meta/recipes-support/libical/libical_2.0.0.bb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-support/libical/libical_2.0.0.bb b/meta/recipes-support/libical/libical_2.0.0.bb index 1042e6fa38..d4fe868eb4 100644 --- a/meta/recipes-support/libical/libical_2.0.0.bb +++ b/meta/recipes-support/libical/libical_2.0.0.bb | |||
@@ -8,6 +8,7 @@ SECTION = "libs" | |||
8 | 8 | ||
9 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ | 9 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ |
10 | file://Remove-cmake-check-for-Perl.patch \ | 10 | file://Remove-cmake-check-for-Perl.patch \ |
11 | file://0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch \ | ||
11 | " | 12 | " |
12 | DEPENDS = "icu" | 13 | DEPENDS = "icu" |
13 | 14 | ||
@@ -15,13 +16,6 @@ SRC_URI[md5sum] = "6bf8e5f5a3ba88baf390d0134e05d76e" | |||
15 | SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da" | 16 | SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da" |
16 | UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" | 17 | UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" |
17 | 18 | ||
18 | inherit cmake | 19 | inherit cmake pkgconfig |
19 | 20 | ||
20 | FILES_${PN}-dev += "${libdir}/cmake/*" | 21 | FILES_${PN}-dev += "${libdir}/cmake/*" |
21 | |||
22 | # | ||
23 | # Turn specific library paths in the pkgconfig file into standard library entries | ||
24 | # | ||
25 | do_install_append () { | ||
26 | sed -i -e "s#${STAGING_LIBDIR}/lib\([a-z0-9]*\)\.so#-l\1#g" ${D}${libdir}/pkgconfig/libical.pc | ||
27 | } | ||