diff mbox series

[meta-oe] libnfs: update 5.0.2 -> 5.0.3

Message ID 20240212171958.35956-1-f_l_k@t-online.de
State Accepted
Headers show
Series [meta-oe] libnfs: update 5.0.2 -> 5.0.3 | expand

Commit Message

Markus Volk Feb. 12, 2024, 5:19 p.m. UTC
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...s.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch | 12 ++++++------
 .../libnfs/{libnfs_5.0.2.bb => libnfs_5.0.3.bb}      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-connectivity/libnfs/{libnfs_5.0.2.bb => libnfs_5.0.3.bb} (90%)

Comments

Khem Raj Feb. 12, 2024, 10:38 p.m. UTC | #1
This fails with newer gcc-14 and clang-18

https://errors.yoctoproject.org/Errors/Details/752904/

On Mon, Feb 12, 2024 at 9:20 AM Markus Volk <f_l_k@t-online.de> wrote:
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  ...s.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch | 12 ++++++------
>  .../libnfs/{libnfs_5.0.2.bb => libnfs_5.0.3.bb}      |  2 +-
>  2 files changed, 7 insertions(+), 7 deletions(-)
>  rename meta-oe/recipes-connectivity/libnfs/{libnfs_5.0.2.bb => libnfs_5.0.3.bb} (90%)
>
> 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 55595104a..978f38d01 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
> @@ -29,19 +29,19 @@ Upstream-Status: Pending
>   2 files changed, 5 insertions(+), 5 deletions(-)
>
>  diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index 4fb0fe7..8e5a0e4 100644
> +index 5be774d..6b4fd25 100644
>  --- a/CMakeLists.txt
>  +++ b/CMakeLists.txt
> -@@ -6,11 +6,11 @@ project(libnfs
> -
> - set(SOVERSION 11.1.0 CACHE STRING "" FORCE)
> +@@ -7,11 +7,11 @@ project(libnfs
> + set(SOVERSION 11.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")
>  +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_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_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/lib/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files")
> +-set(INSTALL_PKGCONFIG_DIR "${INSTALL_LIB_DIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) 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_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files")
>
> diff --git a/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb b/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb
> similarity index 90%
> rename from meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb
> rename to meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb
> index afec2753c..068c827f7 100644
> --- a/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb
> +++ b/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb
> @@ -7,7 +7,7 @@ SRC_URI = " \
>         git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \
>         file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \
>  "
> -SRCREV = "40348f45d6beb8a8f50b6b63414a98fc1a061b7d"
> +SRCREV = "4379837536d9eac537810dc7b13071136049b22a"
>  S = "${WORKDIR}/git"
>
>  inherit cmake
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#108715): https://lists.openembedded.org/g/openembedded-devel/message/108715
> Mute This Topic: https://lists.openembedded.org/mt/104315753/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

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 55595104a..978f38d01 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
@@ -29,19 +29,19 @@  Upstream-Status: Pending
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4fb0fe7..8e5a0e4 100644
+index 5be774d..6b4fd25 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -6,11 +6,11 @@ project(libnfs
- 
- set(SOVERSION 11.1.0 CACHE STRING "" FORCE)
+@@ -7,11 +7,11 @@ project(libnfs
+ set(SOVERSION 11.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")
 +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_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_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/lib/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files")
+-set(INSTALL_PKGCONFIG_DIR "${INSTALL_LIB_DIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) 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_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files")
  
diff --git a/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb b/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb
similarity index 90%
rename from meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb
rename to meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb
index afec2753c..068c827f7 100644
--- a/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb
+++ b/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb
@@ -7,7 +7,7 @@  SRC_URI = " \
 	git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \
 	file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \
 "
-SRCREV = "40348f45d6beb8a8f50b6b63414a98fc1a061b7d"
+SRCREV = "4379837536d9eac537810dc7b13071136049b22a"
 S = "${WORKDIR}/git"
 
 inherit cmake