From patchwork Wed Dec 14 22:39:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 705804 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 3tfBNH6PKyz9sCM for ; Thu, 15 Dec 2016 09:39:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ECczvb4+"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 659AB2A3FB; Wed, 14 Dec 2016 22:39: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 ygEt6WFBKNbB; Wed, 14 Dec 2016 22:39:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id BDC132E319; Wed, 14 Dec 2016 22:39:53 +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 5E0751C023E for ; Wed, 14 Dec 2016 22:39:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 58199896D2 for ; Wed, 14 Dec 2016 22:39:52 +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 hzrpc5GFldiX for ; Wed, 14 Dec 2016 22:39:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wj0-f196.google.com (mail-wj0-f196.google.com [209.85.210.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 2792989246 for ; Wed, 14 Dec 2016 22:39:51 +0000 (UTC) Received: by mail-wj0-f196.google.com with SMTP id j10so7123367wjb.3 for ; Wed, 14 Dec 2016 14:39:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=nvcNWajS2g2VRhtQEsVL/xPduRZLo2LlcYkdgWw5q1c=; b=ECczvb4+R3ZMMlfjB4JTZUGmigoG3AaGatea/HuGjS7fNAR4uKPAcXWdhlqipIJkm1 W4owmG/k+sRypvudx8Z3RdM2ALcAHg/sKM2eEMDn2vm5OMyR635TSV7/NPwdyOlq2VwN UT5+H69A28vAm+fi0l/j6qKoRhqymv0R6ACQTJVpZpi7n631jvWitNUc7CZluPtpMRSw rBccqRbW8woJ9YWyHpDtzYnCRzroUjwEmhKbHcqRKUicy1wJJykNMIadY8wr+Hp4loH/ E9Nvz+5EKNMzemXxOISP7XrGtWhY9syC/BZbklyBXOR9cyfLeOtZBJ9CSyIrnuwY57AA l29w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=nvcNWajS2g2VRhtQEsVL/xPduRZLo2LlcYkdgWw5q1c=; b=APNrAtmRHgOC+PxVqUAwaCnMzC5AUBb4NH6BSvnNGL47i8RZbSedxtgdMXaI9kqz7S +WfPnCqdjR1wLUNR4ojpPSlYuGu19sLt95KM+warIebR9WzzAjKvIIHnD6kB2KFMkOIJ jBHt0hrNNKDrad1acHh7I/2+EAtVWhDX/uM88Bp6hQwuV7NiUtj11ryKViNrUqlAQFFw z0NafTtFiprcTBkiSNdvgexTHAQ9UCHCbgbCxSEzdPwnOjl2arHqBq8ATz38/XqFKZEw oZUMBTBC1ta0PxHKMDG2gqwmt5IukSA44nWe80pwY/TVHztWdxSLCGiUdZwb4HIK8kgA OIEg== X-Gm-Message-State: AKaTC034zCv+/Vb9wUD3we5Y5CIY2wxvVryOQsC6BDzNr613anDOpa+QsswdEWJ5i9suDQ== X-Received: by 10.194.238.163 with SMTP id vl3mr89165036wjc.169.1481755189472; Wed, 14 Dec 2016 14:39:49 -0800 (PST) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id v202sm9581916wmv.8.2016.12.14.14.39.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Dec 2016 14:39:48 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.88) (envelope-from ) id 1cHIDD-0004Ln-N1; Wed, 14 Dec 2016 23:39:47 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 14 Dec 2016 23:39:43 +0100 Message-Id: <20161214223943.16676-1-peter@korsgaard.com> X-Mailer: git-send-email 2.10.2 Subject: [Buildroot] [PATCH] docker-engine: needs pkg-config 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" Fixes: http://autobuild.buildroot.org/results/fcc/fcc32f6cdc46f354a016a9b137d4f51d4054cdb6/ http://autobuild.buildroot.org/results/083/0832b7be86c525522e2caed66246d5aeb365afb2/ http://autobuild.buildroot.org/results/ede/ede0ddf0c5685ece8443a9b1bbd5c63b4d98af33/ pkg-config is used for some of the docker-engine dependencies (at least libseccomp and libsystemd), so make sure it is available. The make.sh script used to configure docker-engine uses the PKG_CONFIG variable, but the libseccomp-golang go module simply uses whatever pkg-config binary it finds in the path at build time, so also pass TARGET_MAKE_ENV to ensure our cross-pkg-config is used. For consistency and robustness against future changes, use both approaches for the configure and build steps. Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index f895dcc..7b5a8a4 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -10,14 +10,16 @@ DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE -DOCKER_ENGINE_DEPENDENCIES = host-go +DOCKER_ENGINE_DEPENDENCIES = host-go host-pkgconf DOCKER_ENGINE_GOPATH = "$(@D)/vendor" DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ CGO_ENABLED=1 \ CGO_NO_EMULATION=1 \ GOBIN="$(@D)/bin" \ - GOPATH="$(DOCKER_ENGINE_GOPATH)" + GOPATH="$(DOCKER_ENGINE_GOPATH)" \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + $(TARGET_MAKE_ENV) DOCKER_ENGINE_GLDFLAGS = \ -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ @@ -66,6 +68,7 @@ define DOCKER_ENGINE_CONFIGURE_CMDS ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker cd $(@D) && \ GITCOMMIT="unknown" BUILDTIME="$$(date)" VERSION="$(DOCKER_ENGINE_VERSION)" \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \ bash ./hack/make/.go-autogen endef