[oe,meta-oe,6/8] libinih: Fix multilib build

Message ID 20191219152529.725879-6-raj.khem@gmail.com
State New
Headers show
Series
  • [oe,meta-oe,1/8] luajit: Add ppc/ppc64 to unsupported arch list
Related show

Commit Message

Khem Raj Dec. 19, 2019, 3:25 p.m.
Fixes
ERROR: libinih-0.0+gitrAUTOINC+25078f7156-r3 do_package: QA Issue: libinih: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libinih.a
  /usr/lib/libinihcpp.a
  /usr/lib/pkgconfig
  /usr/lib/pkgconfig/inihcpp.pc
  /usr/lib/pkgconfig/inih.pc

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...rs-to-specify-multilib-specific-dirs.patch | 50 +++++++++++++++++++
 meta-oe/recipes-support/inih/libinih_git.bb   |  6 ++-
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-support/inih/libinih/0001-Use-GNUInstallDirs-to-specify-multilib-specific-dirs.patch

-- 
2.24.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-support/inih/libinih/0001-Use-GNUInstallDirs-to-specify-multilib-specific-dirs.patch b/meta-oe/recipes-support/inih/libinih/0001-Use-GNUInstallDirs-to-specify-multilib-specific-dirs.patch
new file mode 100644
index 0000000000..7fe7973f69
--- /dev/null
+++ b/meta-oe/recipes-support/inih/libinih/0001-Use-GNUInstallDirs-to-specify-multilib-specific-dirs.patch
@@ -0,0 +1,50 @@ 
+From e99c040e32d261a61ca283ccfad7d1a3f5937922 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 18 Dec 2019 23:02:15 -0800
+Subject: [PATCH] Use GNUInstallDirs to specify multilib specific dirs
+
+Helps in building on arches where default baselib is lib64
+
+Upstream-Status: Submitted [https://github.com/OSSystems/inih/pull/3]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt     | 6 ++++--
+ lib/CMakeLists.txt | 2 +-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 906b3e1..683a0c7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,8 +1,10 @@
+ cmake_minimum_required(VERSION 2.6)
+ project(inih)
+ 
+-add_subdirectory(lib)
++INCLUDE(GNUInstallDirs)
++
+ add_subdirectory(include)
++add_subdirectory(lib)
+ 
+ if( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
+   set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-fPIC")
+@@ -10,4 +12,4 @@ endif( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
+ 
+ configure_file(inih.pc.in inih.pc @ONLY)
+ configure_file(inihcpp.pc.in inihcpp.pc @ONLY)
+-install(FILES ${CMAKE_BINARY_DIR}/inih.pc ${CMAKE_BINARY_DIR}/inihcpp.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
++install(FILES ${CMAKE_BINARY_DIR}/inih.pc ${CMAKE_BINARY_DIR}/inihcpp.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 63a16e9..18da39c 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -18,5 +18,5 @@ else(BUILD_SHARED_LIBS)
+   add_library(inihcpp STATIC ini.c INIReader.cpp)
+ endif(BUILD_SHARED_LIBS)
+ 
+-install(TARGETS inih inihcpp DESTINATION lib)
++install(TARGETS inih inihcpp DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+-- 
+2.24.1
+
diff --git a/meta-oe/recipes-support/inih/libinih_git.bb b/meta-oe/recipes-support/inih/libinih_git.bb
index 48271f721c..9bcb8c8800 100644
--- a/meta-oe/recipes-support/inih/libinih_git.bb
+++ b/meta-oe/recipes-support/inih/libinih_git.bb
@@ -8,8 +8,10 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=dae28cbf28207425e0d0b3eb835f4bde"
 PR = "r3"
 
 # The github repository provides a cmake and pkg-config integration
-SRCREV = "25078f7156eb8647b3b35dd25f9ae6f8c4ee0589"
-SRC_URI = "git://github.com/OSSystems/inih.git"
+SRCREV = "ccfdd188894d01814d6e5e09cd97d3ff41521f43"
+SRC_URI = "git://github.com/OSSystems/inih.git \
+           file://0001-Use-GNUInstallDirs-to-specify-multilib-specific-dirs.patch \
+          "
 
 S = "${WORKDIR}/git"