diff --git a/isula-build.spec b/isula-build.spec index 88e1f15..2dfaf22 100644 --- a/isula-build.spec +++ b/isula-build.spec @@ -2,7 +2,7 @@ Name: isula-build Version: 0.9.6 -Release: 20 +Release: 21 Summary: A tool to build container images License: Mulan PSL V2 URL: https://gitee.com/openeuler/isula-build @@ -102,6 +102,12 @@ fi /usr/share/bash-completion/completions/isula-build %changelog +* Thu Feb 22 2024 luofng - 0.9.6-21 +- Type: enhencement +- CVE:NA +- SUG:NA +- DESC:support for building with clang + * Tue Dec 26 2023 daisicheng - 0.9.6-20 - Type:bugfix - CVE:NA diff --git a/patch/0137-fix-cflags-for-clang-build.patch b/patch/0137-fix-cflags-for-clang-build.patch new file mode 100644 index 0000000..481afb6 --- /dev/null +++ b/patch/0137-fix-cflags-for-clang-build.patch @@ -0,0 +1,25 @@ +From a0b5196a28035fcb7e3d700409afd045b1bd2263 Mon Sep 17 00:00:00 2001 +From: liyunfei +Date: Mon, 20 Nov 2023 16:57:14 +0800 +Subject: [PATCH] fix cflags for clang build + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 0d6bd01..caa5de3 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,7 +22,7 @@ BUILDTAGS := seccomp + BUILDFLAGS := -tags "$(BUILDTAGS)" + TMPDIR := /tmp/isula_build_tmpdir + BEFLAG := -tmpdir=${TMPDIR} +-SAFEBUILDFLAGS := -buildid=IdByIsula -buildmode=pie -extldflags=-ftrapv -extldflags=-zrelro -extldflags=-znow $(BEFLAG) $(LDFLAGS) ++SAFEBUILDFLAGS := -buildid=IdByIsula -buildmode=pie -extldflags=-ftrapv -extldflags=-Wl,-z,relro -extldflags=-Wl,-z,now $(BEFLAG) $(LDFLAGS) + STATIC_LDFLAGS := -linkmode=external -extldflags "-static-pie -Wl,-z,now" + + IMAGE_BUILDARGS := $(if $(http_proxy), --build-arg http_proxy=$(http_proxy)) +-- +2.33.0 + \ No newline at end of file diff --git a/series.conf b/series.conf index 046706b..f765f62 100644 --- a/series.conf +++ b/series.conf @@ -45,3 +45,4 @@ patch/0133-cmd-daemon-add-base-test-for-runDaemon-and-before-fu.patch patch/0134-add-dt-for-interface-manifest-health-status-in-daemo.patch patch/0135-fix-the-login_test-in-daemon-for-euleros-and-openeul.patch patch/0136-add-manifest.json-verification-before-loading-a-tar.patch +patch/0137-fix-cflags-for-clang-build.patch