From abe9cb2e1ce5f39e9a77851bfe4c6ab977156447 Mon Sep 17 00:00:00 2001 From: tiberium Date: Fri, 22 Mar 2024 19:19:07 +0800 Subject: [PATCH] fix clang compile error due to flag format error (cherry picked from commit d9e8e5d8bf6706bae01b691b7c718fd0616d6a83) --- containerd.spec | 8 +++++++- patch/0006-containerd-Makefile-modify.patch | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/containerd.spec b/containerd.spec index 30fd3c0..86eb9fe 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.6.22 Name: containerd -Release: 10 +Release: 11 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io @@ -68,6 +68,12 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml %exclude %{_bindir}/containerd-stress %changelog +* Thu Mar 21 2024 tiberium - 1.6.22-11 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix clang compile issue due to ldflags format error + * Fri Mar 22 2024 zhongjiawei - 1.6.22-10 - Type:bugfix - ID:NA diff --git a/patch/0006-containerd-Makefile-modify.patch b/patch/0006-containerd-Makefile-modify.patch index fc0b947..35090de 100644 --- a/patch/0006-containerd-Makefile-modify.patch +++ b/patch/0006-containerd-Makefile-modify.patch @@ -36,7 +36,7 @@ index f1b28ce..5b5f54c 100644 +BEP_FLAGS=-tmpdir=/tmp/containerd-build-bep -SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static" $(EXTRA_LDFLAGS)' -+GO_LDFLAGS=-ldflags ' -buildid=IdByIsula -extldflags=-zrelro -extldflags=-znow $(BEP_FLAGS) -X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) $(EXTRA_LDFLAGS)' ++GO_LDFLAGS=-ldflags ' -buildid=IdByIsula -extldflags=-Wl,-z,relro,-z,now $(BEP_FLAGS) -X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) $(EXTRA_LDFLAGS)' +SHIM_GO_LDFLAGS=-ldflags '-extldflags=-static' -ldflags '-buildid=IdByIsula $(BEP_FLAGS) -X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -linkmode=external -extldflags=-Wl,-z,relro,-z,now' # Project packages. -- Gitee