aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2021-03-03 15:32:51 +0800
committerKhem Raj <raj.khem@gmail.com>2021-03-03 11:08:29 -0800
commitffc6732d9da05051e57f1dceebf16b61a228830f (patch)
treeb3bff9e0eb5b2e295512bc8718e4d0595faf29e4
parent39046f1a1d1a93a9976af33ab51626fe02df045e (diff)
downloadmeta-openembedded-contrib-ffc6732d9da05051e57f1dceebf16b61a228830f.tar.gz
meta-openembedded-contrib-ffc6732d9da05051e57f1dceebf16b61a228830f.tar.bz2
meta-openembedded-contrib-ffc6732d9da05051e57f1dceebf16b61a228830f.zip
libinih: 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 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>
-rw-r--r--meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch24
-rw-r--r--meta-oe/recipes-support/inih/libinih_git.bb3
2 files changed, 26 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch b/meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch
new file mode 100644
index 0000000000..fb7b85cfd4
--- /dev/null
+++ b/meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch
@@ -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
+
diff --git a/meta-oe/recipes-support/inih/libinih_git.bb b/meta-oe/recipes-support/inih/libinih_git.bb
index 227e2a7b7c..5beb292819 100644
--- a/meta-oe/recipes-support/inih/libinih_git.bb
+++ b/meta-oe/recipes-support/inih/libinih_git.bb
@@ -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"