mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
openwsman: Upgrade to 2.8.1 release
Fixes build with cmake4+ Drop upstreamed patches Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
be3c11c82d
commit
804abb58c6
@ -1,71 +0,0 @@
|
||||
From 09101da4efaa5584b7f3f3f3bfa5dbb4d1e26948 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 24 Jul 2023 22:09:21 -0700
|
||||
Subject: [PATCH] Link with libm for floor() function
|
||||
|
||||
LLD linker finds this missing symbol
|
||||
|
||||
arm-yoe-linux-gnueabi-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: floor
|
||||
>>> referenced by src/lib/libwsman.so.1.0.0
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/Openwsman/openwsman/pull/195]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 10 ++++++++++
|
||||
configure.ac | 3 ++-
|
||||
src/lib/CMakeLists.txt | 4 ++++
|
||||
3 files changed, 16 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 6e54c66b..507ee633 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -297,6 +297,16 @@ ELSE(HAVE_LIBDL)
|
||||
SET(HAVE_LIBDL 0)
|
||||
ENDIF(HAVE_LIBDL)
|
||||
|
||||
+# m
|
||||
+
|
||||
+FIND_LIBRARY( HAVE_LIBM "m" )
|
||||
+IF(HAVE_LIBM)
|
||||
+ SET(M_LIBRARIES ${HAVE_LIBM})
|
||||
+ SET(HAVE_LIBM 1)
|
||||
+ELSE(HAVE_LIBM)
|
||||
+ SET(HAVE_LIBM 0)
|
||||
+ENDIF(HAVE_LIBM)
|
||||
+
|
||||
# crypt
|
||||
|
||||
FIND_LIBRARY( HAVE_LIBCRYPT "crypt" )
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 125564da..010fa0b6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -128,7 +128,8 @@ daemon \
|
||||
va_copy \
|
||||
memmove \
|
||||
bcopy \
|
||||
-gmtime_r
|
||||
+gmtime_r \
|
||||
+floor
|
||||
)
|
||||
AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
|
||||
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
|
||||
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
|
||||
index 5c51781f..496fd672 100644
|
||||
--- a/src/lib/CMakeLists.txt
|
||||
+++ b/src/lib/CMakeLists.txt
|
||||
@@ -36,6 +36,10 @@ if( HAVE_LIBDL )
|
||||
TARGET_LINK_LIBRARIES(wsman ${DL_LIBRARIES})
|
||||
endif( HAVE_LIBDL )
|
||||
|
||||
+if( HAVE_LIBM )
|
||||
+TARGET_LINK_LIBRARIES(wsman ${M_LIBRARIES})
|
||||
+endif( HAVE_LIBM )
|
||||
+
|
||||
IF( ENABLE_EVENTING_SUPPORT )
|
||||
TARGET_LINK_LIBRARIES( wsman ${WSMAN_CLIENT_PKG} )
|
||||
ENDIF( ENABLE_EVENTING_SUPPORT )
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -13,8 +13,6 @@ Upstream-Status: Pending
|
||||
src/lib/u/lock.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/lib/u/lock.c b/src/lib/u/lock.c
|
||||
index 025eea4c..b31c77b5 100644
|
||||
--- a/src/lib/u/lock.c
|
||||
+++ b/src/lib/u/lock.c
|
||||
@@ -50,7 +50,7 @@
|
||||
@ -26,6 +24,3 @@ index 025eea4c..b31c77b5 100644
|
||||
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
|
||||
#endif
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
libssl is required by wsman_client_transport if ENABLE_EVENTING_SUPPORT enabled.
|
||||
|
||||
Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
|
||||
|
||||
diff -Nurp openwsman-2.4.12.orig/src/lib/CMakeLists.txt openwsman-2.4.12/src/lib/CMakeLists.txt
|
||||
--- openwsman-2.4.12.orig/src/lib/CMakeLists.txt 2014-10-28 23:04:47.000000000 +0800
|
||||
+++ openwsman-2.4.12/src/lib/CMakeLists.txt 2014-12-31 11:09:20.340428523 +0800
|
||||
@@ -56,6 +56,9 @@ TARGET_LINK_LIBRARIES( ${WSMAN_CLIENT_TR
|
||||
SET_TARGET_PROPERTIES( ${WSMAN_CLIENT_TRANSPORT_PKG} PROPERTIES VERSION 1.0.0 SOVERSION 1)
|
||||
INSTALL(TARGETS ${WSMAN_CLIENT_TRANSPORT_PKG} DESTINATION ${LIB_INSTALL_DIR})
|
||||
|
||||
+IF( ENABLE_EVENTING_SUPPORT )
|
||||
+TARGET_LINK_LIBRARIES( ${WSMAN_CLIENT_TRANSPORT_PKG} ${OPENSSL_LIBRARIES} )
|
||||
+ENDIF( ENABLE_EVENTING_SUPPORT )
|
||||
|
||||
############### wsman_client ###############
|
||||
|
||||
@ -15,16 +15,13 @@ DEPENDS = "curl libxml2 openssl libpam"
|
||||
inherit features_check
|
||||
REQUIRED_DISTRO_FEATURES = "pam"
|
||||
|
||||
SRCREV = "0120e256faa255d997d9a49d5207662c0b73d430"
|
||||
SRCREV = "20efbccaf804a5a27a914eb8802b806416c03ece"
|
||||
|
||||
SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=main;protocol=https \
|
||||
file://libssl-is-required-if-eventint-supported.patch \
|
||||
SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=main;protocol=https;tag=v${PV} \
|
||||
file://openwsmand.service \
|
||||
file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \
|
||||
file://0001-Link-with-libm-for-floor-function.patch \
|
||||
"
|
||||
|
||||
|
||||
LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user