diff mbox series

[meta-oe] qhull: pass LIB_INSTALL_DIR to fix builds with multilib

Message ID 20250414070418.760168-1-martin.jansa@gmail.com
State Under Review
Headers show
Series [meta-oe] qhull: pass LIB_INSTALL_DIR to fix builds with multilib | expand

Commit Message

Martin Jansa April 14, 2025, 7:04 a.m. UTC 
From: Martin Jansa <martin.jansa@gmail.com>

* fixes:
ERROR: QA Issue: lib32-qhull: Files/directories were installed but not shipped in any package:
  /usr/lib/libqhull_r.so.8.0.2
  /usr/lib/libqhullcpp.a
  /usr/lib/libqhull_r.so.8.0
  /usr/lib/libqhullstatic_r.a
  /usr/lib/libqhullstatic.a
  /usr/lib/libqhull_r.so
  /usr/lib/cmake
  /usr/lib/pkgconfig
  /usr/lib/cmake/Qhull
  /usr/lib/cmake/Qhull/QhullTargets.cmake
  /usr/lib/cmake/Qhull/QhullTargets-noconfig.cmake
  /usr/lib/cmake/Qhull/QhullConfig.cmake
  /usr/lib/cmake/Qhull/QhullConfigVersion.cmake
  /usr/lib/pkgconfig/qhullcpp.pc
  /usr/lib/pkgconfig/qhullstatic_r.pc
  /usr/lib/pkgconfig/qhullstatic.pc
  /usr/lib/pkgconfig/qhull_r.pc
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
lib32-qhull: 17 installed and not shipped files. [installed-vs-shipped]

as well as lib32-python3-matplotlib failures which won't find qhull as /usr/lib
isn't staged by lib32-qhull.

Run-time dependency qhull_r found: NO (tried pkgconfig and cmake)
Check usable header "libqhull_r/qhull_ra.h" : YES

../matplotlib-3.10.1/extern/meson.build:28:19: ERROR: C shared or static library 'qhull_r' not found

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
 ...DIR-for-cmake-and-pkgconfig-files-to.patch | 35 +++++++++++++++++++
 .../recipes-extended/qhull/qhull_2020.2.bb    |  5 ++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-extended/qhull/qhull/0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/qhull/qhull/0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch b/meta-oe/recipes-extended/qhull/qhull/0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch
new file mode 100644
index 0000000000..7003dd76c2
--- /dev/null
+++ b/meta-oe/recipes-extended/qhull/qhull/0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch
@@ -0,0 +1,35 @@ 
+From f72312ae0becb581cd428d17dbbcdf1b6f02ebee Mon Sep 17 00:00:00 2001
+From: Orion Poplawski <orion@nwra.com>
+Date: Tue, 4 Oct 2022 21:56:58 -0600
+Subject: [PATCH] Use ${LIB_INSTALL_DIR} for cmake and pkgconfig files to
+ support multi-lib on Fedora/RedHat
+
+Upstream-Status: Backport [https://github.com/qhull/qhull/commit/67d231c872aa1bae892e5da9646a10b303477039]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f50b187..c2248f9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -709,7 +709,7 @@ configure_file(${PROJECT_SOURCE_DIR}/build/config.cmake.in
+   @ONLY
+ )
+ 
+-set(ConfigPackageLocation lib/cmake/Qhull)
++set(ConfigPackageLocation ${LIB_INSTALL_DIR}/cmake/Qhull)
+ install(EXPORT QhullTargets
+   FILE
+     QhullTargets.cmake
+@@ -728,7 +728,7 @@ install(
+     Devel
+ )
+ 
+-set(PkgConfigLocation lib/pkgconfig)
++set(PkgConfigLocation ${LIB_INSTALL_DIR}/pkgconfig)
+ foreach(pkgconfig IN ITEMS "${qhull_SHAREDR};Qhull reentrant shared library"
+                            "${qhull_STATIC};Qhull static library"
+                            "${qhull_STATICR};Qhull reentrant static library"
diff --git a/meta-oe/recipes-extended/qhull/qhull_2020.2.bb b/meta-oe/recipes-extended/qhull/qhull_2020.2.bb
index 4533b0a337..13638c391b 100644
--- a/meta-oe/recipes-extended/qhull/qhull_2020.2.bb
+++ b/meta-oe/recipes-extended/qhull/qhull_2020.2.bb
@@ -4,13 +4,16 @@  SECTION = "libs"
 LICENSE = "Qhull"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=484ee0cacf0472e8b40225b116f6296c"
 
-SRC_URI = "http://www.qhull.org/download/qhull-2020-src-8.0.2.tgz"
+SRC_URI = "http://www.qhull.org/download/qhull-2020-src-8.0.2.tgz \
+    file://0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch \
+"
 SRC_URI[sha256sum] = "b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e"
 
 CFLAGS += "-fPIC"
 
 EXTRA_OECMAKE += "\
     -DCMAKE_SKIP_RPATH=ON \
+    -DLIB_INSTALL_DIR=${baselib} \
 "
 
 inherit cmake