Signed-off-by: Oleksandr Kravchuk <open.sou...@oleksandr-kravchuk.com> --- ...header-files-without-prefix-dir-inih.patch | 24 ------------------- meta-oe/recipes-support/inih/libinih_git.bb | 6 ++--- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch
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 deleted file mode 100644 index fb7b85cfd..000000000 --- a/meta-oe/recipes-support/inih/files/0001-include-install-header-files-without-prefix-dir-inih.patch +++ /dev/null @@ -1,24 +0,0 @@ -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.k...@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 cf390800b..d54c1e49e 100644 --- a/meta-oe/recipes-support/inih/libinih_git.bb +++ b/meta-oe/recipes-support/inih/libinih_git.bb @@ -8,10 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dae28cbf28207425e0d0b3eb835f4bde" PR = "r3" # The github repository provides a cmake and pkg-config integration -SRCREV = "c858aff8c31fa63ef4d1e0176c10e5928cde9a23" -SRC_URI = "git://github.com/OSSystems/inih.git;branch=master;protocol=https \ - file://0001-include-install-header-files-without-prefix-dir-inih.patch \ - " +SRCREV = "0e635abc80127d2f05b8175a141f5e243861855d" +SRC_URI = "git://github.com/OSSystems/inih.git;branch=master;protocol=https" UPSTREAM_CHECK_COMMITS = "1" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#96676): https://lists.openembedded.org/g/openembedded-devel/message/96676 Mute This Topic: https://lists.openembedded.org/mt/90521904/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-