From patchwork Sun Jul 24 14:43:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 652100 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ry6b24SwDz9ryQ for ; Mon, 25 Jul 2016 00:43:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DE3D22712E; Sun, 24 Jul 2016 14:43:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y1ArIy9Vk6bl; Sun, 24 Jul 2016 14:43:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 551E22D594; Sun, 24 Jul 2016 14:43:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 44E3B1C10B8 for ; Sun, 24 Jul 2016 14:43:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3C5BE8897D for ; Sun, 24 Jul 2016 14:43:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8u8L6ludQ0Ab for ; Sun, 24 Jul 2016 14:43:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9FA7D8890F for ; Sun, 24 Jul 2016 14:43:53 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 34D21328; Sun, 24 Jul 2016 16:43:53 +0200 (CEST) Received: from localhost (LFbn-1-6691-76.w90-120.abo.wanadoo.fr [90.120.129.76]) by mail.free-electrons.com (Postfix) with ESMTPSA id E944E263; Sun, 24 Jul 2016 16:43:52 +0200 (CEST) From: Thomas Petazzoni To: Romain Naour , Christian Stewart , Geoff Levand Date: Sun, 24 Jul 2016 16:43:45 +0200 Message-Id: <1469371427-25201-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.7.4 Cc: Thomas Petazzoni , Buildroot List Subject: [Buildroot] [PATCH 1/3] docker-containerd: pass -extldflags '-static' on when BR2_STATIC_LIBS=y X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" There is no reason to link Go binaries statically, unless when BR2_STATIC_LIBS=y. Signed-off-by: Thomas Petazzoni Tested-by: Christian Stewart --- package/docker-containerd/docker-containerd.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index b1acd44..06432e9 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -18,8 +18,11 @@ DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ GOPATH="$(DOCKER_CONTAINERD_GOPATH)" DOCKER_CONTAINERD_GLDFLAGS = \ - -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) \ - -extldflags '-static' + -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) + +ifeq ($(BR2_STATIC_LIBS),y) +DOCKER_CONTAINERD_GLDFLAGS += -extldflags '-static' +endif define DOCKER_CONTAINERD_CONFIGURE_CMDS mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker