diff options
author | Kai Kang <kai.kang@windriver.com> | 2017-04-12 09:42:00 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-18 14:21:40 +0200 |
commit | 2688cbadeb71a7331c924f7f6b109fc53b813231 (patch) | |
tree | aef9c0bd5c4dbf497ce793101eb10a5fb16e5378 /meta-oe/recipes-support/gflags | |
parent | 56c956f6c0f366dadfdece4933548dcd3b2b9fc9 (diff) | |
download | meta-openembedded-2688cbadeb71a7331c924f7f6b109fc53b813231.tar.gz |
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 <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/gflags')
-rw-r--r-- | meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 3 |
1 files changed, 1 insertions, 2 deletions
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" | |||
8 | SRC_URI = "https://github.com/gflags/gflags/archive/v${PV}.tar.gz" | 8 | SRC_URI = "https://github.com/gflags/gflags/archive/v${PV}.tar.gz" |
9 | SRC_URI[md5sum] = "b99048d9ab82d8c56e876fb1456c285e" | 9 | SRC_URI[md5sum] = "b99048d9ab82d8c56e876fb1456c285e" |
10 | SRC_URI[sha256sum] = "466c36c6508a451734e4f4d76825cf9cd9b8716d2b70ef36479ae40f08271f88" | 10 | SRC_URI[sha256sum] = "466c36c6508a451734e4f4d76825cf9cd9b8716d2b70ef36479ae40f08271f88" |
11 | S = "${WORKDIR}/${PN}-${PV}/" | ||
12 | 11 | ||
13 | FILES_${PN}-dev += "${libdir}/cmake" | 12 | FILES_${PN}-dev += "${libdir}/cmake" |
14 | 13 | ||
15 | inherit cmake | 14 | inherit cmake |
16 | 15 | ||
17 | EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF" | 16 | EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}" |
18 | 17 | ||
19 | PACKAGES =+ "${PN}-bash-completion" | 18 | PACKAGES =+ "${PN}-bash-completion" |
20 | FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh" | 19 | FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh" |