support clang build

(cherry picked from commit 24e2cf37ade9b49d94effff97f4a84ef9fac5a4d)
This commit is contained in:
luofeng14 2024-03-28 21:54:58 +08:00 committed by openeuler-sync-bot
parent 143888b91c
commit cb5815fb0a
3 changed files with 33 additions and 1 deletions

View File

@ -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 <luofeng13@huawei.com> - 0.9.6-21
- Type: enhencement
- CVE:NA
- SUG:NA
- DESC:support for building with clang
* Tue Dec 26 2023 daisicheng <daisicheng@huawei.com> - 0.9.6-20
- Type:bugfix
- CVE:NA

View File

@ -0,0 +1,25 @@
From a0b5196a28035fcb7e3d700409afd045b1bd2263 Mon Sep 17 00:00:00 2001
From: liyunfei <liyunfei33@huawei.com>
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

View File

@ -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