!208 [sync] PR-204: fix 2 undeclared functions,support clang build

From: @openeuler-sync-bot 
Reviewed-by: @kouwq 
Signed-off-by: @kouwq
This commit is contained in:
openeuler-ci-bot 2024-11-08 01:03:21 +00:00 committed by Gitee
commit 5ecf4e2319
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,37 @@
From 575e88c4591efe7783d00445880269c17e9db579 Mon Sep 17 00:00:00 2001
From: yuncang123 <1050706328@qq.com>
Date: Sat, 7 Sep 2024 18:34:09 +0800
Subject: [PATCH] fix function undeclared in libdm-common.c and dev-cache.c,support clang
---
lib/device/dev-cache.c | 1 +
libdm/libdm-common.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c
index f565179..87b3bc3 100644
--- a/lib/device/dev-cache.c
+++ b/lib/device/dev-cache.c
@@ -31,6 +31,7 @@
#include <locale.h>
/* coverity[unnecessary_header] needed for MuslC */
#include <sys/file.h>
+#include <sys/time.h>
struct dev_iter {
struct btree_iter *current;
diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index dcc9e40..d219e1e 100644
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -24,6 +24,7 @@
#include <sys/ioctl.h>
#include <fcntl.h>
#include <dirent.h>
+#include <syslog.h>
#ifdef UDEV_SYNC_SUPPORT
# include <sys/types.h>
--
2.43.0

View File

@ -43,7 +43,7 @@
Name: lvm2
Version: 2.03.14
Release: 15
Release: 16
Epoch: 8
Summary: Tools for logical volume management
License: GPLv2+ and LGPLv2.1 and BSD
@ -83,6 +83,7 @@ Patch31: 0031-udev-import-previous-results-of-blkid-when-in-suspen.patch
Patch32: 0032-clean-up-group-struct-in-_stats_create_group-error-path.patch
Patch33: 0033-dm-event-release-buffer-on-dm_event_get_version.patch
Patch34: 0034-dmstats-Fix-memory-leak-on-error-path.patch
Patch35: 0035-fix-function-undeclared-in-libdm-common.c-and-dev-cache.c.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@ -509,6 +510,10 @@ fi
%changelog
* Thu Nov 7 2024 Deyuan Fan <fandeyuan@kylinos.cn> - 8:2.03.14-16
- support clang build:
- fix function undeclared in libdm-common.c and dev-cache.c
* Wed Oct 23 2024 yanshuai <yanshuai@kylinos.cn> - 8:2.03.14-15
- dmstats: Fix memory leak on error path