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 F05BE1395E2 for ; Wed, 9 Nov 2016 19:20:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3814CE0818; Wed, 9 Nov 2016 19:20:58 +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 1F1F3E0818 for ; Wed, 9 Nov 2016 19:20:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 F070F3413A6 for ; Wed, 9 Nov 2016 19:20:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A994308 for ; Wed, 9 Nov 2016 18:04:54 +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: <1478710779.093745daf4f6471b253570d176f8f8e9131c4e26.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: 093745daf4f6471b253570d176f8f8e9131c4e26 X-VCS-Branch: master Date: Wed, 9 Nov 2016 18:04:54 +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: 7314db1b-47f6-4673-8b23-04651ba13b9e X-Archives-Hash: bbd2cae1aeeb8cf8fabc771ac0a6097c commit: 093745daf4f6471b253570d176f8f8e9131c4e26 Author: Manuel Rüger gentoo org> AuthorDate: Wed Nov 9 16:59:39 2016 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Wed Nov 9 16:59:39 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093745da app-emulation/containerd: Sync live ebuild Package-Manager: portage-2.3.0 app-emulation/containerd/containerd-9999.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild index 6ffef1d..4b81e8a 100644 --- a/app-emulation/containerd/containerd-9999.ebuild +++ b/app-emulation/containerd/containerd-9999.ebuild @@ -5,6 +5,8 @@ EAPI=6 EGO_PN="github.com/docker/${PN}" +inherit toolchain-funcs + if [[ ${PV} == *9999 ]]; then inherit golang-vcs else @@ -23,19 +25,18 @@ SLOT="0" IUSE="+seccomp" DEPEND="" -RDEPEND="app-emulation/runc +RDEPEND=">=app-emulation/runc-1.0.0_rc2 seccomp? ( sys-libs/libseccomp )" S=${WORKDIR}/${P}/src/${EGO_PN} -src_prepare() { - eapply_user -} - src_compile() { - local options=( $(usex seccomp "seccomp") ) + local options=( $(usex seccomp "seccomp") ) myldflags export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - LDFLAGS= emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}" + if gcc-specs-pie; then + myldflags="-extldflags -fno-PIC" + fi + LDFLAGS=${myldflags} emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}" } src_install() {