19583b7229
0069-containerd-add-check-in-spec.patch 0070-containerd-kill-container-init-process-if-runc-start.patch 0071-containerd-fix-containerd-shim-residual-when-kill-co.patch 0072-containerd-fix-deadlock-on-commit-error.patch 0073-containerd-backport-upstream-patches.patch 0074-containerd-fix-exec-event-missing-due-to-pid-reuse.patch 0075-containerd-fix-dm-left-when-pause-contaienr-and-kill-shim.patch 0076-containerd-fix-start-container-failed-with-id-exists.patch 0077-containerd-drop-opt-package.patch 0078-containerd-bump-containerd-ttrpc-699c4e40d1.patch 0079-containerd-fix-race-access-for-mobySubcribed.patch 0080-containerd-improve-log-for-debugging.patch 0081-containerd-reduce-permissions-for-bundle-di.patch 0082-containerd-fix-publish-command-wait-block-for.patch 0083-containerd-optimize-cgo-compile-options.patch Signed-off-by:songyanting <songyanting@huawei.com>
35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
From 4ae41b01ba2dfd05e8eae0adac6dc3d54c461117 Mon Sep 17 00:00:00 2001
|
|
From: songyanting <songyanting@huawei.com>
|
|
Date: Mon, 24 Jan 2022 11:08:44 +0800
|
|
Subject: [PATCH] [Huawei]containerd:optimize cgo compile options
|
|
|
|
offering:EulerOS Server
|
|
Type:bugfix
|
|
CVE:
|
|
DTS/AR:
|
|
reason:optimize cgo compile options
|
|
|
|
Signed-off-by: songyanting songyanting@huawei.com
|
|
---
|
|
Makefile | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index a7d0888..49a90e6 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -172,8 +172,8 @@ bin/%: cmd/% FORCE
|
|
mkdir -p $(BEP_DIR)
|
|
@echo "$(WHALE) $@${BINARY_SUFFIX}"
|
|
CGO_ENABLED=1 \
|
|
- CGO_CFLAGS="-fstack-protector-strong -fPIE" \
|
|
- CGO_CPPFLAGS="-fstack-protector-strong -fPIE" \
|
|
+ CGO_CFLAGS="-fstack-protector-strong" \
|
|
+ CGO_CPPFLAGS="-fstack-protector-strong" \
|
|
CGO_LDFLAGS_ALLOW='-Wl,-z,relro,-z,now' \
|
|
CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \
|
|
go build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS} ./$<
|
|
--
|
|
2.23.0
|
|
|