mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 02:31:27 +00:00
libnfs: update 5.0.2 -> 5.0.3
Add cmake checks for sys/uio.h Fixes build issues with latest compiler e.g. gcc-14 Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+6
-6
@@ -29,19 +29,19 @@ Upstream-Status: Pending
|
|||||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index 4fb0fe7..8e5a0e4 100644
|
index 5be774d..6b4fd25 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -6,11 +6,11 @@ project(libnfs
|
@@ -7,11 +7,11 @@ project(libnfs
|
||||||
|
set(SOVERSION 11.2.0 CACHE STRING "" FORCE)
|
||||||
set(SOVERSION 11.1.0 CACHE STRING "" FORCE)
|
|
||||||
|
|
||||||
|
set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for binaries")
|
||||||
-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
|
-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
|
||||||
+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation directory for libraries")
|
+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation directory for libraries")
|
||||||
set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
|
set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
|
||||||
set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
|
set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
|
||||||
-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
|
-set(INSTALL_PKGCONFIG_DIR "${INSTALL_LIB_DIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
|
||||||
-set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/lib/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files")
|
-set(INSTALL_CMAKE_DIR "${INSTALL_LIB_DIR}/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files")
|
||||||
+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
|
+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
|
||||||
+set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files")
|
+set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files")
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
From d0fa719d49f38777911a8e99717f2d4b30811080 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Mon, 12 Feb 2024 19:24:54 -0800
|
||||||
|
Subject: [PATCH] cmake: Test for sys/uio.h
|
||||||
|
|
||||||
|
writev() API is used in few places and it will need including sys/uio.h
|
||||||
|
for getting the funciton signature
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/sahlberg/libnfs/pull/440]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
cmake/ConfigureChecks.cmake | 1 +
|
||||||
|
cmake/config.h.cmake | 3 +++
|
||||||
|
2 files changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
|
||||||
|
index 0258fc8..c26a02d 100644
|
||||||
|
--- a/cmake/ConfigureChecks.cmake
|
||||||
|
+++ b/cmake/ConfigureChecks.cmake
|
||||||
|
@@ -22,6 +22,7 @@ check_include_file("sys/stat.h" HAVE_SYS_STAT_H)
|
||||||
|
check_include_file("sys/sysmacros.h" HAVE_SYS_SYSMACROS_H)
|
||||||
|
check_include_file("sys/time.h" HAVE_SYS_TIME_H)
|
||||||
|
check_include_file("sys/types.h" HAVE_SYS_TYPES_H)
|
||||||
|
+check_include_file("sys/uio.h" HAVE_SYS_UIO_H)
|
||||||
|
check_include_file("sys/vfs.h" HAVE_SYS_VFS_H)
|
||||||
|
check_include_file("unistd.h" HAVE_UNISTD_H)
|
||||||
|
check_include_file("utime.h" HAVE_UTIME_H)
|
||||||
|
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
|
||||||
|
index 4016c6c..6263896 100644
|
||||||
|
--- a/cmake/config.h.cmake
|
||||||
|
+++ b/cmake/config.h.cmake
|
||||||
|
@@ -90,6 +90,9 @@
|
||||||
|
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||||
|
#cmakedefine HAVE_SYS_TYPES_H
|
||||||
|
|
||||||
|
+/* Define to 1 if you have the <sys/uio.h> header file. */
|
||||||
|
+#cmakedefine HAVE_SYS_UIO_H
|
||||||
|
+
|
||||||
|
/* Define to 1 if you have the <sys/vfs.h> header file. */
|
||||||
|
#cmakedefine HAVE_SYS_VFS_H
|
||||||
|
|
||||||
|
--
|
||||||
|
2.43.1
|
||||||
|
|
||||||
+2
-1
@@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=825301ba17efc9d188ee0abd4b924ada"
|
|||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \
|
git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \
|
||||||
file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \
|
file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \
|
||||||
|
file://0001-cmake-Test-for-sys-uio.h.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "40348f45d6beb8a8f50b6b63414a98fc1a061b7d"
|
SRCREV = "4379837536d9eac537810dc7b13071136049b22a"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit cmake
|
inherit cmake
|
||||||
Reference in New Issue
Block a user