Skip to content

Commit

Permalink
libinih: install header files without prefix dir inih
Browse files Browse the repository at this point in the history
The other flavor of inih which adapted by Fedora and Ubuntu installs
header files to /usr/include directly. And xfsprogs 5.10.0 also checks
ini.h without extra search path and failed. So install header files
without prefix dir inih.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
  • Loading branch information
kkang-wr authored and kraj committed Mar 3, 2021
1 parent 39046f1 commit ffc6732
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
include: install header files without prefix dir inih

The other flavor of inih which adapted by Fedora and Ubuntu installs
header files to /usr/include directly. And xfsprogs 5.10.0 also checks
ini.h without extra search path and fails. So install header files
without prefix dir inih.

Upstream-Status: Submitted [https://github.com/OSSystems/inih/pull/4]

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
include/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 7a46ee7..4a9033f 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1 +1 @@
-install(FILES ini.h INIReader.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/inih)
+install(FILES ini.h INIReader.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
--
2.17.1

3 changes: 2 additions & 1 deletion meta-oe/recipes-support/inih/libinih_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ PR = "r3"
# The github repository provides a cmake and pkg-config integration
SRCREV = "c858aff8c31fa63ef4d1e0176c10e5928cde9a23"
SRC_URI = "git://github.com/OSSystems/inih.git \
"
file://0001-include-install-header-files-without-prefix-dir-inih.patch \
"

UPSTREAM_CHECK_COMMITS = "1"

Expand Down

0 comments on commit ffc6732

Please sign in to comment.