From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 34D3D1395E2 for ; Wed, 9 Nov 2016 19:02:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BB13E0A69; Wed, 9 Nov 2016 19:02:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8497CE0A69 for ; Wed, 9 Nov 2016 19:02:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD9843413AD for ; Wed, 9 Nov 2016 19:02:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D8A224BF for ; Wed, 9 Nov 2016 19:02:11 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1478718097.a5cbf1fcd7bdbbf6f5e4168ff807d0627400f0a0.mrueg@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/containerd/containerd-9999.ebuild X-VCS-Directories: app-emulation/containerd/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: a5cbf1fcd7bdbbf6f5e4168ff807d0627400f0a0 X-VCS-Branch: master Date: Wed, 9 Nov 2016 19:02:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a691cec7-fa26-4025-9eac-1ff092b444a3 X-Archives-Hash: 86613b1f6f08a07b89a7ccaccc53f2fd commit: a5cbf1fcd7bdbbf6f5e4168ff807d0627400f0a0 Author: Manuel Rüger gentoo org> AuthorDate: Wed Nov 9 19:01:23 2016 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Wed Nov 9 19:01:37 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5cbf1fc app-emulation/containerd: Sync live ebuild Package-Manager: portage-2.3.0 app-emulation/containerd/containerd-9999.ebuild | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild index 4b81e8a..ab4ce7e 100644 --- a/app-emulation/containerd/containerd-9999.ebuild +++ b/app-emulation/containerd/containerd-9999.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.tools" LICENSE="Apache-2.0" SLOT="0" -IUSE="+seccomp" +IUSE="hardened +seccomp" DEPEND="" RDEPEND=">=app-emulation/runc-1.0.0_rc2 @@ -31,12 +31,9 @@ RDEPEND=">=app-emulation/runc-1.0.0_rc2 S=${WORKDIR}/${P}/src/${EGO_PN} src_compile() { - local options=( $(usex seccomp "seccomp") ) myldflags + local options=( $(usex seccomp "seccomp") ) export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - if gcc-specs-pie; then - myldflags="-extldflags -fno-PIC" - fi - LDFLAGS=${myldflags} emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}" + LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}" } src_install() {