Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/runc/
Date: Wed, 04 Mar 2020 17:07:42
Message-Id: 1583341645.cdb819a4babe6e64c7353ec58b669cba44f2cd26.williamh@gentoo
1 commit: cdb819a4babe6e64c7353ec58b669cba44f2cd26
2 Author: William Hubbs <william.hubbs <AT> sony <DOT> com>
3 AuthorDate: Wed Mar 4 17:06:57 2020 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 4 17:07:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb819a4
7
8 app-emulation/runc: remove src_prepare function
9
10 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
11
12 app-emulation/runc/runc-1.0.0_rc10.ebuild | 14 ++------------
13 1 file changed, 2 insertions(+), 12 deletions(-)
14
15 diff --git a/app-emulation/runc/runc-1.0.0_rc10.ebuild b/app-emulation/runc/runc-1.0.0_rc10.ebuild
16 index 2338fa34630..00d4ecb746d 100644
17 --- a/app-emulation/runc/runc-1.0.0_rc10.ebuild
18 +++ b/app-emulation/runc/runc-1.0.0_rc10.ebuild
19 @@ -31,17 +31,6 @@ RDEPEND="
20 !app-emulation/docker-runc
21 "
22
23 -src_prepare() {
24 - pushd src/${EGO_PN}
25 - default
26 - sed -i -e "/^GIT_BRANCH/d"\
27 - -e "/^GIT_BRANCH_CLEAN/d"\
28 - -e "/^COMMIT_NO/d"\
29 - -e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\
30 - Makefile || die
31 - popd || die
32 -}
33 -
34 src_compile() {
35 # Taken from app-emulation/docker-1.7.0-r1
36 export CGO_CFLAGS="-I${ROOT}/usr/include"
37 @@ -56,7 +45,8 @@ src_compile() {
38 $(usex kmem '' 'nokmem')
39 )
40
41 - GOPATH="${S}" emake BUILDTAGS="${options[*]}" -C src/${EGO_PN}
42 + COMMIT=${RUNC_COMMIT} GOPATH="${S}" emake BUILDTAGS="${options[*]}" \
43 + -C src/${EGO_PN}
44 }
45
46 src_install() {