From c918215c9abe33f02c1671c370d48bde84c20d63 Mon Sep 17 00:00:00 2001 From: luofeng14 Date: Sun, 25 Feb 2024 11:02:35 +0000 Subject: [PATCH] support clang build Signed-off-by: luofeng14 --- ...sync-support-for-building-with-clang.patch | 26 +++++++++++++++++++ kiwi.spec | 9 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 huawei-sync-support-for-building-with-clang.patch diff --git a/huawei-sync-support-for-building-with-clang.patch b/huawei-sync-support-for-building-with-clang.patch new file mode 100644 index 0000000..3e99645 --- /dev/null +++ b/huawei-sync-support-for-building-with-clang.patch @@ -0,0 +1,26 @@ +From 53ad53556e476961e76c99d14b492250704acccc Mon Sep 17 00:00:00 2001 +From: zhoujing +Date: Tue, 7 Nov 2023 20:32:54 +0800 +Subject: [PATCH] [sync] Support for building with clang + +cherry-pick from https://gitee.com/openeuler-risc-v/kiwi/commit/b896168af10084bd227918eb1e68cfe34581a635 +--- + tools/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index f2ea5d7..126aaa3 100755 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -3,7 +3,7 @@ buildroot = / + SRCS := $(wildcard *.c) + PRGS := $(patsubst %.c,%,$(SRCS)) + +-CC = gcc ++CC ?= gcc + + all: $(PRGS) + +-- +2.42.0 + diff --git a/kiwi.spec b/kiwi.spec index e8bf906..d65e841 100644 --- a/kiwi.spec +++ b/kiwi.spec @@ -2,7 +2,7 @@ Name: kiwi Version: 9.25.1 -Release: 1 +Release: 2 License: GPLv3+ Summary: Flexible operating system image builder @@ -11,6 +11,7 @@ Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name} Patch0: openEuler-use-rsync-link.patch Patch1: openEuler-custom-make.patch +Patch2: huawei-sync-support-for-building-with-clang.patch BuildRequires: bash-completion dracut fdupes gcc make BuildRequires: python3-devel python3-setuptools shadow-utils @@ -194,6 +195,12 @@ done %{_mandir}/man8/%{name}* %changelog +* Thu Feb 22 2024 luofng - 9.25.1-2 +- Type: enhencement +- CVE:NA +- SUG:NA +- DESC:support for building with clang + * Tue Oct 24 2023 yanglongkang - 9.25.1-1 - update version to 9.25.1