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-13 15:18:42 +0100 |
commit | 0445e68fdbbba5c4efb6422c89ee864e4273b114 (patch) | |
tree | aa0e881d743d5888acdf3705f87d2014523a9d42 /meta/recipes-support/libical/libical_2.0.0.bb | |
parent | f544e1d10e9dc0f750efdb45a78ce9d5c9603070 (diff) | |
download | openembedded-core-0445e68fdbbba5c4efb6422c89ee864e4273b114.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]
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://Remove-cmake-check-for-Perl.patch \ + file://0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch \ " DEPENDS = "icu" @@ -15,13 +16,6 @@ SRC_URI[md5sum] = "6bf8e5f5a3ba88baf390d0134e05d76e" SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da" UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" -inherit cmake +inherit cmake pkgconfig FILES_${PN}-dev += "${libdir}/cmake/*" - -# -# Turn specific library paths in the pkgconfig file into standard library entries -# -do_install_append () { - sed -i -e "s#${STAGING_LIBDIR}/lib\([a-z0-9]*\)\.so#-l\1#g" ${D}${libdir}/pkgconfig/libical.pc -} |