summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity/libnfs
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-connectivity/libnfs')
-rw-r--r--meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch10
-rw-r--r--meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch44
-rw-r--r--meta-oe/recipes-connectivity/libnfs/libnfs_6.0.2.bb (renamed from meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb)13
3 files changed, 11 insertions, 56 deletions
diff --git a/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch b/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch
index 978f38d019..ffb6bfbea8 100644
--- a/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch
+++ b/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch
@@ -1,4 +1,4 @@
1From 95708ff427c12b58e53fab225a08c811ca358394 Mon Sep 17 00:00:00 2001 1From 0d5d6a14f6e9c2ff8998ebb3acbefcad6221952f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 3 May 2023 22:27:10 +0200 3Date: Wed, 3 May 2023 22:27:10 +0200
4Subject: [PATCH] CMakeLists.txt: respect ${CMAKE_INSTALL_LIBDIR} for multilib 4Subject: [PATCH] CMakeLists.txt: respect ${CMAKE_INSTALL_LIBDIR} for multilib
@@ -29,11 +29,11 @@ Upstream-Status: Pending
29 2 files changed, 5 insertions(+), 5 deletions(-) 29 2 files changed, 5 insertions(+), 5 deletions(-)
30 30
31diff --git a/CMakeLists.txt b/CMakeLists.txt 31diff --git a/CMakeLists.txt b/CMakeLists.txt
32index 5be774d..6b4fd25 100644 32index 1b94d2e..a295403 100644
33--- a/CMakeLists.txt 33--- a/CMakeLists.txt
34+++ b/CMakeLists.txt 34+++ b/CMakeLists.txt
35@@ -7,11 +7,11 @@ project(libnfs 35@@ -7,11 +7,11 @@ project(libnfs
36 set(SOVERSION 11.2.0 CACHE STRING "" FORCE) 36 set(SOVERSION 16.2.0 CACHE STRING "" FORCE)
37 37
38 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for binaries") 38 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for binaries")
39-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") 39-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
@@ -48,10 +48,10 @@ index 5be774d..6b4fd25 100644
48 option(BUILD_SHARED_LIBS "Build shared libraries" ON) 48 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
49 option(ENABLE_TESTS "Build and run test programs" OFF) 49 option(ENABLE_TESTS "Build and run test programs" OFF)
50diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt 50diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
51index 88ba7b8..5ff89dc 100644 51index 987b735..9b2032f 100644
52--- a/lib/CMakeLists.txt 52--- a/lib/CMakeLists.txt
53+++ b/lib/CMakeLists.txt 53+++ b/lib/CMakeLists.txt
54@@ -23,5 +23,5 @@ set_target_properties(nfs PROPERTIES 54@@ -24,5 +24,5 @@ set_target_properties(nfs PROPERTIES
55 55
56 install(TARGETS nfs EXPORT libnfs 56 install(TARGETS nfs EXPORT libnfs
57 RUNTIME DESTINATION bin 57 RUNTIME DESTINATION bin
diff --git a/meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch b/meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch
deleted file mode 100644
index de3ab82292..0000000000
--- a/meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From d0fa719d49f38777911a8e99717f2d4b30811080 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 12 Feb 2024 19:24:54 -0800
4Subject: [PATCH] cmake: Test for sys/uio.h
5
6writev() API is used in few places and it will need including sys/uio.h
7for getting the funciton signature
8
9Upstream-Status: Submitted [https://github.com/sahlberg/libnfs/pull/440]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 cmake/ConfigureChecks.cmake | 1 +
13 cmake/config.h.cmake | 3 +++
14 2 files changed, 4 insertions(+)
15
16diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
17index 0258fc8..c26a02d 100644
18--- a/cmake/ConfigureChecks.cmake
19+++ b/cmake/ConfigureChecks.cmake
20@@ -22,6 +22,7 @@ check_include_file("sys/stat.h" HAVE_SYS_STAT_H)
21 check_include_file("sys/sysmacros.h" HAVE_SYS_SYSMACROS_H)
22 check_include_file("sys/time.h" HAVE_SYS_TIME_H)
23 check_include_file("sys/types.h" HAVE_SYS_TYPES_H)
24+check_include_file("sys/uio.h" HAVE_SYS_UIO_H)
25 check_include_file("sys/vfs.h" HAVE_SYS_VFS_H)
26 check_include_file("unistd.h" HAVE_UNISTD_H)
27 check_include_file("utime.h" HAVE_UTIME_H)
28diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
29index 4016c6c..6263896 100644
30--- a/cmake/config.h.cmake
31+++ b/cmake/config.h.cmake
32@@ -90,6 +90,9 @@
33 /* Define to 1 if you have the <sys/types.h> header file. */
34 #cmakedefine HAVE_SYS_TYPES_H
35
36+/* Define to 1 if you have the <sys/uio.h> header file. */
37+#cmakedefine HAVE_SYS_UIO_H
38+
39 /* Define to 1 if you have the <sys/vfs.h> header file. */
40 #cmakedefine HAVE_SYS_VFS_H
41
42--
432.43.1
44
diff --git a/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb b/meta-oe/recipes-connectivity/libnfs/libnfs_6.0.2.bb
index a6eabc6095..83f32d3a07 100644
--- a/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb
+++ b/meta-oe/recipes-connectivity/libnfs/libnfs_6.0.2.bb
@@ -3,13 +3,12 @@ HOMEPAGE = "https://github.com/sahlberg/libnfs"
3LICENSE = "LGPL-2.1-only & BSD-2-Clause & GPL-3.0-only" 3LICENSE = "LGPL-2.1-only & BSD-2-Clause & GPL-3.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=825301ba17efc9d188ee0abd4b924ada" 4LIC_FILES_CHKSUM = "file://COPYING;md5=825301ba17efc9d188ee0abd4b924ada"
5 5
6SRC_URI = " \ 6SRC_URI = "git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \
7 git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \ 7 file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \
8 file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \ 8 "
9 file://0001-cmake-Test-for-sys-uio.h.patch \ 9SRCREV = "18c5c73ee88bb7dc8da0d55dc95164bb77e49dc6"
10" 10
11SRCREV = "4379837536d9eac537810dc7b13071136049b22a" 11DEPENDS += "gnutls"
12S = "${WORKDIR}/git"
13 12
14inherit cmake 13inherit cmake
15 14
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 23:28:26 +0000