From 2688cbadeb71a7331c924f7f6b109fc53b813231 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 12 Apr 2017 09:42:00 +0800 Subject: gflags: correct S and update library install directory The current setting of S is not right for multilib. Remove the setting and use the default value. And library install directory is not right for multilib either. It fails with [installed-vs-shipped] QA error: | ERROR: gflags-2.2.0-r0 do_package: QA Issue: gflags: Files/directories | were installed but not shipped in any package: | /usr/lib/libgflags.so | /usr/lib/libgflags_nothreads.so.2.2 Set cmake variable LIB_INSTALL_DIR with ${baselib} to fix the issue. Signed-off-by: Kai Kang Signed-off-by: Martin Jansa --- meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta-oe') diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.0.bb b/meta-oe/recipes-support/gflags/gflags_2.2.0.bb index b9188c312..f2092a3af 100644 --- a/meta-oe/recipes-support/gflags/gflags_2.2.0.bb +++ b/meta-oe/recipes-support/gflags/gflags_2.2.0.bb @@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" SRC_URI = "https://github.com/gflags/gflags/archive/v${PV}.tar.gz" SRC_URI[md5sum] = "b99048d9ab82d8c56e876fb1456c285e" SRC_URI[sha256sum] = "466c36c6508a451734e4f4d76825cf9cd9b8716d2b70ef36479ae40f08271f88" -S = "${WORKDIR}/${PN}-${PV}/" FILES_${PN}-dev += "${libdir}/cmake" inherit cmake -EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF" +EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}" PACKAGES =+ "${PN}-bash-completion" FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh" -- cgit v1.2.3-54-g00ecf