MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-15 06:45:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

libnfs: upgrade 5.0.3 -> 6.0.2

Browse Source 
0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patc
refreshed for 6.0.2

0001-cmake-Test-for-sys-uio.h.patch
removed since it's included in 6.0.2

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu 2024-12-17 17:01:23 +08:00 committed by Khem Raj
parent 82f4dc4839
commit 60cd45ada4
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 9 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch
View File

@ -1,4 +1,4 @@
From 95708ff427c12b58e53fab225a08c811ca358394 Mon Sep 17 00:00:00 2001
From 0d5d6a14f6e9c2ff8998ebb3acbefcad6221952f Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 3 May 2023 22:27:10 +0200
Subject: [PATCH] CMakeLists.txt: respect ${CMAKE_INSTALL_LIBDIR} for multilib
@ -29,11 +29,11 @@ Upstream-Status: Pending
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5be774d..6b4fd25 100644
index 1b94d2e..a295403 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,11 +7,11 @@ project(libnfs
set(SOVERSION 11.2.0 CACHE STRING "" FORCE)
set(SOVERSION 16.2.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")
@ -48,10 +48,10 @@ index 5be774d..6b4fd25 100644
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
option(ENABLE_TESTS "Build and run test programs" OFF)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 88ba7b8..5ff89dc 100644
index 987b735..9b2032f 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -23,5 +23,5 @@ set_target_properties(nfs PROPERTIES
@@ -24,5 +24,5 @@ set_target_properties(nfs PROPERTIES
install(TARGETS nfs EXPORT libnfs
RUNTIME DESTINATION bin

44
meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch
View File

@ -1,44 +0,0 @@
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

8
meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb → meta-oe/recipes-connectivity/libnfs/libnfs_6.0.2.bb
View File

@ -3,12 +3,10 @@ HOMEPAGE = "https://github.com/sahlberg/libnfs"
LICENSE = "LGPL-2.1-only & BSD-2-Clause & GPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=825301ba17efc9d188ee0abd4b924ada"
SRC_URI = " \
git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \
SRC_URI = "git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \
file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \
file://0001-cmake-Test-for-sys-uio.h.patch \
"
SRCREV = "4379837536d9eac537810dc7b13071136049b22a"
"
SRCREV = "18c5c73ee88bb7dc8da0d55dc95164bb77e49dc6"
S = "${WORKDIR}/git"
inherit cmake