Gentoo Archives: gentoo-commits

From: Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/plinkseq/
Date: Sun, 31 Jul 2016 22:40:55
Message-Id: 1470004836.0bcd2e23d38e6dcf01c69ff75da32c5f419881c5.mmokrejs@gentoo
1 commit: 0bcd2e23d38e6dcf01c69ff75da32c5f419881c5
2 Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
3 AuthorDate: Sun Jul 31 22:40:36 2016 +0000
4 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
5 CommitDate: Sun Jul 31 22:40:36 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0bcd2e23
7
8 sci-biology/plinkseq: plugin.proto:74:12: FileDescriptorProto is not defined
9
10 Package-Manager: portage-2.3.0
11
12 sci-biology/plinkseq/plinkseq-0.10.ebuild | 12 ++++++++++--
13 1 file changed, 10 insertions(+), 2 deletions(-)
14
15 diff --git a/sci-biology/plinkseq/plinkseq-0.10.ebuild b/sci-biology/plinkseq/plinkseq-0.10.ebuild
16 index e8665ce..71871e8 100644
17 --- a/sci-biology/plinkseq/plinkseq-0.10.ebuild
18 +++ b/sci-biology/plinkseq/plinkseq-0.10.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2015 Gentoo Foundation
21 +# Copyright 1999-2016 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23 # $Id$
24
25 @@ -28,7 +28,15 @@ src_prepare(){
26 sed -e "s/= -static/=/g" -i config_defs.Makefile || die
27 rm -rf sources/ext/protobuf-* || die
28 sed -e 's#^all:.*#all: echo "skipping compilation of bundled dev-libs/protobuf"#' -i sources/ext/Makefile || die
29 - find . -name \*.proto | while read f; do d=`dirname $f`; pushd $d; protoc --cpp_out=. *.proto || exit 255; popd; done || die
30 + # TODO: fix also sources/ext/sources/include/DUMMY/include/google/protobuf/compiler/plugin.proto causing:
31 + # plugin.proto: Import "google/protobuf/descriptor.proto" was not found or had errors.
32 + # plugin.proto:74:12: "FileDescriptorProto" is not defined.
33 + find . -name \*.proto | while read f; do \
34 + d=`dirname $f`; \
35 + pushd $d; \
36 + protoc --cpp_out=. *.proto || exit 255; \
37 + popd; \
38 + done || die
39 autotools-utils_src_prepare
40 }