Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/protobuf: ChangeLog protobuf-2.5.0-r2.ebuild protobuf-2.6.1-r1.ebuild
Date: Thu, 27 Nov 2014 23:20:06
Message-Id: 20141127232001.48F3AB0C1@oystercatcher.gentoo.org
1 radhermit 14/11/27 23:20:01
2
3 Modified: ChangeLog protobuf-2.5.0-r2.ebuild
4 protobuf-2.6.1-r1.ebuild
5 Log:
6 Fix python/java builds (bug #530922) and doc installs.
7
8 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
9
10 Revision Changes Path
11 1.73 dev-libs/protobuf/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.73&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.73&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?r1=1.72&r2=1.73
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v
20 retrieving revision 1.72
21 retrieving revision 1.73
22 diff -u -r1.72 -r1.73
23 --- ChangeLog 27 Nov 2014 19:51:33 -0000 1.72
24 +++ ChangeLog 27 Nov 2014 23:20:01 -0000 1.73
25 @@ -1,6 +1,10 @@
26 # ChangeLog for dev-libs/protobuf
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.72 2014/11/27 19:51:33 radhermit Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.73 2014/11/27 23:20:01 radhermit Exp $
30 +
31 + 27 Nov 2014; Tim Harder <radhermit@g.o> protobuf-2.5.0-r2.ebuild,
32 + protobuf-2.6.1-r1.ebuild:
33 + Fix python/java builds (bug #530922) and doc installs.
34
35 27 Nov 2014; Tim Harder <radhermit@g.o> protobuf-2.5.0-r2.ebuild,
36 protobuf-2.6.1-r1.ebuild:
37
38
39
40 1.3 dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.3&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.3&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?r1=1.2&r2=1.3
45
46 Index: protobuf-2.5.0-r2.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v
49 retrieving revision 1.2
50 retrieving revision 1.3
51 diff -u -r1.2 -r1.3
52 --- protobuf-2.5.0-r2.ebuild 27 Nov 2014 19:51:33 -0000 1.2
53 +++ protobuf-2.5.0-r2.ebuild 27 Nov 2014 23:20:01 -0000 1.3
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2014 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.2 2014/11/27 19:51:33 radhermit Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.3 2014/11/27 23:20:01 radhermit Exp $
59
60 EAPI=5
61 AUTOTOOLS_AUTORECONF=1
62 @@ -43,25 +43,33 @@
63 fi
64 }
65
66 -src_compile() {
67 - autotools-multilib_src_compile
68 +multilib_src_compile() {
69 + default
70
71 - if use python; then
72 - einfo "Compiling Python library ..."
73 - pushd python >/dev/null
74 - distutils-r1_src_compile
75 - popd >/dev/null
76 + if multilib_is_native_abi; then
77 + if use python; then
78 + einfo "Compiling Python library ..."
79 + pushd "${S}"/python >/dev/null
80 + PROTOC="${BUILD_DIR}"/src/protoc distutils-r1_src_compile
81 + popd >/dev/null
82 + fi
83 +
84 + if use java; then
85 + einfo "Compiling Java library ..."
86 + pushd "${S}" >/dev/null
87 + "${BUILD_DIR}"/src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
88 + mkdir java/build
89 + pushd java/src/main/java >/dev/null
90 + ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
91 + popd >/dev/null
92 + jar cf ${PN}.jar -C java/build . || die "jar failed"
93 + popd >/dev/null
94 + fi
95 fi
96 +}
97
98 - if use java; then
99 - einfo "Compiling Java library ..."
100 - src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
101 - mkdir java/build
102 - pushd java/src/main/java >/dev/null
103 - ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
104 - popd >/dev/null
105 - jar cf ${PN}.jar -C java/build . || die "jar failed"
106 - fi
107 +src_compile() {
108 + autotools-multilib_src_compile
109
110 if use emacs; then
111 elisp-compile "${S}"/editors/protobuf-mode.el
112 @@ -79,9 +87,10 @@
113 }
114
115 src_install() {
116 - local DOCS=( CHANGES.txt CONTRIBUTORS.txt README.txt )
117 autotools-multilib_src_install
118
119 + dodoc CHANGES.txt CONTRIBUTORS.txt README.txt
120 +
121 if use python; then
122 pushd python >/dev/null
123 distutils-r1_src_install
124
125
126
127 1.3 dev-libs/protobuf/protobuf-2.6.1-r1.ebuild
128
129 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.3&view=markup
130 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.3&content-type=text/plain
131 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?r1=1.2&r2=1.3
132
133 Index: protobuf-2.6.1-r1.ebuild
134 ===================================================================
135 RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v
136 retrieving revision 1.2
137 retrieving revision 1.3
138 diff -u -r1.2 -r1.3
139 --- protobuf-2.6.1-r1.ebuild 27 Nov 2014 19:51:33 -0000 1.2
140 +++ protobuf-2.6.1-r1.ebuild 27 Nov 2014 23:20:01 -0000 1.3
141 @@ -1,6 +1,6 @@
142 # Copyright 1999-2014 Gentoo Foundation
143 # Distributed under the terms of the GNU General Public License v2
144 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v 1.2 2014/11/27 19:51:33 radhermit Exp $
145 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v 1.3 2014/11/27 23:20:01 radhermit Exp $
146
147 EAPI=5
148 AUTOTOOLS_AUTORECONF=1
149 @@ -44,25 +44,33 @@
150 fi
151 }
152
153 -src_compile() {
154 - autotools-multilib_src_compile
155 +multilib_src_compile() {
156 + default
157
158 - if use python; then
159 - einfo "Compiling Python library ..."
160 - pushd python >/dev/null
161 - distutils-r1_src_compile
162 - popd >/dev/null
163 + if multilib_is_native_abi; then
164 + if use python; then
165 + einfo "Compiling Python library ..."
166 + pushd "${S}"/python >/dev/null
167 + PROTOC="${BUILD_DIR}"/src/protoc distutils-r1_src_compile
168 + popd >/dev/null
169 + fi
170 +
171 + if use java; then
172 + einfo "Compiling Java library ..."
173 + pushd "${S}" >/dev/null
174 + "${BUILD_DIR}"/src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
175 + mkdir java/build
176 + pushd java/src/main/java >/dev/null
177 + ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
178 + popd >/dev/null
179 + jar cf ${PN}.jar -C java/build . || die "jar failed"
180 + popd >/dev/null
181 + fi
182 fi
183 +}
184
185 - if use java; then
186 - einfo "Compiling Java library ..."
187 - src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
188 - mkdir java/build
189 - pushd java/src/main/java >/dev/null
190 - ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
191 - popd >/dev/null
192 - jar cf ${PN}.jar -C java/build . || die "jar failed"
193 - fi
194 +src_compile() {
195 + autotools-multilib_src_compile
196
197 if use emacs; then
198 elisp-compile "${S}"/editors/protobuf-mode.el
199 @@ -80,9 +88,10 @@
200 }
201
202 src_install() {
203 - local DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md )
204 autotools-multilib_src_install
205
206 + dodoc CHANGES.txt CONTRIBUTORS.txt README.md
207 +
208 if use python; then
209 pushd python >/dev/null
210 distutils-r1_src_install
Report Message
Find on MARC Find on Google Groups