[meta-oe][PATCH 0/2] V3: Fix gflags and opencv build errors for multilib

[meta-oe][PATCH 0/2] V3: Fix gflags and opencv build errors for multilib

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

Tested on qemuppc and qemux86-64 with multilib.

Kai Kang (2):
  gflags: correct S and update library install directory
  opencv: correct subpackage name for multilib

 meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 3 +--
 meta-oe/recipes-support/opencv/opencv_3.2.bb   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

-- 
2.10.1

[PATCH 1/2] gflags: correct S and update library install directory

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

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>
---
 meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 3 +--
 1 file changed, 1 insertion(+), 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 b9188c3..f2092a3 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"
-- 
2.10.1

[PATCH 2/2] opencv: correct subpackage name for multilib

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

Subpackage python3-${PN} is not right for multilib and it will be
extended to such as lib32-python3-lib32-opencv.

Replace PN with BPN to fix it.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta-oe/recipes-support/opencv/opencv_3.2.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_3.2.bb b/meta-oe/recipes-support/opencv/opencv_3.2.bb
index b5b4968..2cff212 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.2.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.2.bb
@@ -97,8 +97,8 @@ TARGET_CC_ARCH += "-I${S}/include "
 PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \
     ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \
     ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${PN}', '', d)} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${PN}', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \
     ${PN}-apps"
 
 python populate_packages_prepend () {
-- 
2.10.1