radhermit 14/11/27 23:20:01
Modified: ChangeLog protobuf-2.5.0-r2.ebuild
protobuf-2.6.1-r1.ebuild
Log:
Fix python/java builds (bug #530922) and doc installs.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
4AB3E85B4F064CA3)
Revision Changes Path
1.73 dev-libs/protobuf/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.73&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.73&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?r1=1.72&r2=1.73
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog 27 Nov 2014 19:51:33 -0000 1.72
+++ ChangeLog 27 Nov 2014 23:20:01 -0000 1.73
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/protobuf
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.72
2014/11/27 19:51:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.73
2014/11/27 23:20:01 radhermit Exp $
+
+ 27 Nov 2014; Tim Harder <[email protected]> protobuf-2.5.0-r2.ebuild,
+ protobuf-2.6.1-r1.ebuild:
+ Fix python/java builds (bug #530922) and doc installs.
27 Nov 2014; Tim Harder <[email protected]> protobuf-2.5.0-r2.ebuild,
protobuf-2.6.1-r1.ebuild:
1.3 dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.3&view=markup
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
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?r1=1.2&r2=1.3
Index: protobuf-2.5.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- protobuf-2.5.0-r2.ebuild 27 Nov 2014 19:51:33 -0000 1.2
+++ protobuf-2.5.0-r2.ebuild 27 Nov 2014 23:20:01 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
AUTOTOOLS_AUTORECONF=1
@@ -43,25 +43,33 @@
fi
}
-src_compile() {
- autotools-multilib_src_compile
+multilib_src_compile() {
+ default
- if use python; then
- einfo "Compiling Python library ..."
- pushd python >/dev/null
- distutils-r1_src_compile
- popd >/dev/null
+ if multilib_is_native_abi; then
+ if use python; then
+ einfo "Compiling Python library ..."
+ pushd "${S}"/python >/dev/null
+ PROTOC="${BUILD_DIR}"/src/protoc
distutils-r1_src_compile
+ popd >/dev/null
+ fi
+
+ if use java; then
+ einfo "Compiling Java library ..."
+ pushd "${S}" >/dev/null
+ "${BUILD_DIR}"/src/protoc --java_out=java/src/main/java
--proto_path=src src/google/protobuf/descriptor.proto
+ mkdir java/build
+ pushd java/src/main/java >/dev/null
+ ejavac -d ../../../build $(find . -name '*.java') ||
die "java compilation failed"
+ popd >/dev/null
+ jar cf ${PN}.jar -C java/build . || die "jar failed"
+ popd >/dev/null
+ fi
fi
+}
- if use java; then
- einfo "Compiling Java library ..."
- src/protoc --java_out=java/src/main/java --proto_path=src
src/google/protobuf/descriptor.proto
- mkdir java/build
- pushd java/src/main/java >/dev/null
- ejavac -d ../../../build $(find . -name '*.java') || die "java
compilation failed"
- popd >/dev/null
- jar cf ${PN}.jar -C java/build . || die "jar failed"
- fi
+src_compile() {
+ autotools-multilib_src_compile
if use emacs; then
elisp-compile "${S}"/editors/protobuf-mode.el
@@ -79,9 +87,10 @@
}
src_install() {
- local DOCS=( CHANGES.txt CONTRIBUTORS.txt README.txt )
autotools-multilib_src_install
+ dodoc CHANGES.txt CONTRIBUTORS.txt README.txt
+
if use python; then
pushd python >/dev/null
distutils-r1_src_install
1.3 dev-libs/protobuf/protobuf-2.6.1-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.3&view=markup
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
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?r1=1.2&r2=1.3
Index: protobuf-2.6.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- protobuf-2.6.1-r1.ebuild 27 Nov 2014 19:51:33 -0000 1.2
+++ protobuf-2.6.1-r1.ebuild 27 Nov 2014 23:20:01 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
AUTOTOOLS_AUTORECONF=1
@@ -44,25 +44,33 @@
fi
}
-src_compile() {
- autotools-multilib_src_compile
+multilib_src_compile() {
+ default
- if use python; then
- einfo "Compiling Python library ..."
- pushd python >/dev/null
- distutils-r1_src_compile
- popd >/dev/null
+ if multilib_is_native_abi; then
+ if use python; then
+ einfo "Compiling Python library ..."
+ pushd "${S}"/python >/dev/null
+ PROTOC="${BUILD_DIR}"/src/protoc
distutils-r1_src_compile
+ popd >/dev/null
+ fi
+
+ if use java; then
+ einfo "Compiling Java library ..."
+ pushd "${S}" >/dev/null
+ "${BUILD_DIR}"/src/protoc --java_out=java/src/main/java
--proto_path=src src/google/protobuf/descriptor.proto
+ mkdir java/build
+ pushd java/src/main/java >/dev/null
+ ejavac -d ../../../build $(find . -name '*.java') ||
die "java compilation failed"
+ popd >/dev/null
+ jar cf ${PN}.jar -C java/build . || die "jar failed"
+ popd >/dev/null
+ fi
fi
+}
- if use java; then
- einfo "Compiling Java library ..."
- src/protoc --java_out=java/src/main/java --proto_path=src
src/google/protobuf/descriptor.proto
- mkdir java/build
- pushd java/src/main/java >/dev/null
- ejavac -d ../../../build $(find . -name '*.java') || die "java
compilation failed"
- popd >/dev/null
- jar cf ${PN}.jar -C java/build . || die "jar failed"
- fi
+src_compile() {
+ autotools-multilib_src_compile
if use emacs; then
elisp-compile "${S}"/editors/protobuf-mode.el
@@ -80,9 +88,10 @@
}
src_install() {
- local DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md )
autotools-multilib_src_install
+ dodoc CHANGES.txt CONTRIBUTORS.txt README.md
+
if use python; then
pushd python >/dev/null
distutils-r1_src_install
