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 6C0D31382C5 for ; Thu, 13 May 2021 10:43:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FB20E08C3; Thu, 13 May 2021 10:43:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66E76E08C3 for ; Thu, 13 May 2021 10:43:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D50CC340BDD for ; Thu, 13 May 2021 10:43:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E17D750 for ; Thu, 13 May 2021 10:43:28 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1620902471.db01e788666a794dd6746686a7810efe59b75816.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/runc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/runc/runc-1.0.0_rc10-r1.ebuild app-emulation/runc/runc-1.0.0_rc92.ebuild app-emulation/runc/runc-1.0.0_rc93.ebuild X-VCS-Directories: app-emulation/runc/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: db01e788666a794dd6746686a7810efe59b75816 X-VCS-Branch: master Date: Thu, 13 May 2021 10:43:28 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8e4d7dc7-44c4-4ed9-a92d-2544df85d506 X-Archives-Hash: 88a19cf366c7873fbc4811dfcb6451ae commit: db01e788666a794dd6746686a7810efe59b75816 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu May 13 09:58:55 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu May 13 10:41:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db01e788 app-emulation/runc: fix variables Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/runc/runc-1.0.0_rc10-r1.ebuild | 14 ++++++++------ app-emulation/runc/runc-1.0.0_rc92.ebuild | 14 ++++++++------ app-emulation/runc/runc-1.0.0_rc93.ebuild | 16 +++++++++------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild index 9f60bd86db1..0a433baafd1 100644 --- a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild +++ b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,9 +40,9 @@ RESTRICT+=" test" src_compile() { # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_CFLAGS="-I${ESYSROOT}/usr/include" export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" + -L${ESYSROOT}/usr/$(get_libdir)" # build up optional flags local options=( @@ -54,11 +54,8 @@ src_compile() { ) myemakeargs=( - BINDIR="${ED}/usr/bin" BUILDTAGS="${options[*]}" COMMIT=${RUNC_COMMIT} - DESTDIR="${ED}" - PREFIX="${ED}/usr" GOPATH="${S}" -C "src/${EGO_PN}" ) @@ -67,6 +64,11 @@ src_compile() { } src_install() { + myemakeargs+=( + PREFIX="${ED}/usr" + BINDIR="${ED}/usr/bin" + MANDIR="${ED}/usr/share/man" + ) emake "${myemakeargs[@]}" install install-man install-bash local DOCS=( src/"${EGO_PN}"/{README.md,PRINCIPLES.md,docs/.} ) diff --git a/app-emulation/runc/runc-1.0.0_rc92.ebuild b/app-emulation/runc/runc-1.0.0_rc92.ebuild index fe79682ba08..35e4c457ae5 100644 --- a/app-emulation/runc/runc-1.0.0_rc92.ebuild +++ b/app-emulation/runc/runc-1.0.0_rc92.ebuild @@ -42,9 +42,9 @@ S="${WORKDIR}/${PN}-${MY_PV}" src_compile() { # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_CFLAGS="-I${ESYSROOT}/usr/include" export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" + -L${ESYSROOT}/usr/$(get_libdir)" # build up optional flags local options=( @@ -56,17 +56,19 @@ src_compile() { ) myemakeargs=( - BINDIR="${ED}/usr/bin" BUILDTAGS="${options[*]}" - COMMIT=${RUNC_COMMIT} - DESTDIR="${ED}" - PREFIX="${ED}/usr" + COMMIT="${RUNC_COMMIT}" ) emake "${myemakeargs[@]}" runc man } src_install() { + myemakeargs+=( + PREFIX="${ED}/usr" + BINDIR="${ED}/usr/bin" + MANDIR="${ED}/usr/share/man" + ) emake "${myemakeargs[@]}" install install-man install-bash local DOCS=( README.md PRINCIPLES.md docs/. ) diff --git a/app-emulation/runc/runc-1.0.0_rc93.ebuild b/app-emulation/runc/runc-1.0.0_rc93.ebuild index f89d4a1ce27..316f720fc29 100644 --- a/app-emulation/runc/runc-1.0.0_rc93.ebuild +++ b/app-emulation/runc/runc-1.0.0_rc93.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,9 +42,9 @@ S="${WORKDIR}/${PN}-${MY_PV}" src_compile() { # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_CFLAGS="-I${ESYSROOT}/usr/include" export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" + -L${ESYSROOT}/usr/$(get_libdir)" # build up optional flags local options=( @@ -54,17 +54,19 @@ src_compile() { ) myemakeargs=( - BINDIR="/usr/bin" BUILDTAGS="${options[*]}" - COMMIT=${RUNC_COMMIT} - DESTDIR="${ED}" - PREFIX="/usr" + COMMIT="${RUNC_COMMIT}" ) emake "${myemakeargs[@]}" runc man } src_install() { + myemakeargs+=( + PREFIX="${ED}/usr" + BINDIR="${ED}/usr/bin" + MANDIR="${ED}/usr/share/man" + ) emake "${myemakeargs[@]}" install install-man install-bash local DOCS=( README.md PRINCIPLES.md docs/. )