diff options
-rw-r--r-- | meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch | 24 | ||||
-rw-r--r-- | meta-oe/recipes-support/inih/libinih_git.bb | 3 |
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 @@ | |||
1 | include: install header files without prefix dir inih | ||
2 | |||
3 | The other flavor of inih which adapted by Fedora and Ubuntu installs | ||
4 | header files to /usr/include directly. And xfsprogs 5.10.0 also checks | ||
5 | ini.h without extra search path and fails. So install header files | ||
6 | without prefix dir inih. | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/OSSystems/inih/pull/4] | ||
9 | |||
10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
11 | --- | ||
12 | include/CMakeLists.txt | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt | ||
16 | index 7a46ee7..4a9033f 100644 | ||
17 | --- a/include/CMakeLists.txt | ||
18 | +++ b/include/CMakeLists.txt | ||
19 | @@ -1 +1 @@ | ||
20 | -install(FILES ini.h INIReader.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/inih) | ||
21 | +install(FILES ini.h INIReader.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include) | ||
22 | -- | ||
23 | 2.17.1 | ||
24 | |||
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" | |||
10 | # The github repository provides a cmake and pkg-config integration | 10 | # The github repository provides a cmake and pkg-config integration |
11 | SRCREV = "c858aff8c31fa63ef4d1e0176c10e5928cde9a23" | 11 | SRCREV = "c858aff8c31fa63ef4d1e0176c10e5928cde9a23" |
12 | SRC_URI = "git://github.com/OSSystems/inih.git \ | 12 | SRC_URI = "git://github.com/OSSystems/inih.git \ |
13 | " | 13 | file://0001-include-install-header-files-without-prefix-dir-inih.patch \ |
14 | " | ||
14 | 15 | ||
15 | UPSTREAM_CHECK_COMMITS = "1" | 16 | UPSTREAM_CHECK_COMMITS = "1" |
16 | 17 | ||