diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2013-06-15 11:26:56 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2013-06-15 11:26:56 +0000 |
| commit | 4b8779453ad5c1af58426c51a308cb4db405c802 (patch) | |
| tree | 03409597d7418f129076b9db85e4f3d91295e5ee /dev-libs/protobuf | |
| parent | Version bump alpha and drop older (diff) | |
| download | gentoo-2-4b8779453ad5c1af58426c51a308cb4db405c802.tar.gz gentoo-2-4b8779453ad5c1af58426c51a308cb4db405c802.tar.bz2 gentoo-2-4b8779453ad5c1af58426c51a308cb4db405c802.zip | |
Fix compilation on Darwin, bug #472514
(Portage version: 2.2.01.22013-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'dev-libs/protobuf')
| -rw-r--r-- | dev-libs/protobuf/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-2.5.0.ebuild | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog index 3974734a5fab..3eed0e3874b7 100644 --- a/dev-libs/protobuf/ChangeLog +++ b/dev-libs/protobuf/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/protobuf # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.44 2013/04/02 18:19:55 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.45 2013/06/15 11:26:56 grobian Exp $ + + 15 Jun 2013; Fabian Groffen <grobian@gentoo.org> protobuf-2.5.0.ebuild: + Fix compilation on Darwin, bug #472514 02 Apr 2013; Tim Harder <radhermit@gentoo.org> protobuf-2.4.0a.ebuild, protobuf-2.4.1.ebuild: diff --git a/dev-libs/protobuf/protobuf-2.5.0.ebuild b/dev-libs/protobuf/protobuf-2.5.0.ebuild index 704d51ba6051..81c3fa359430 100644 --- a/dev-libs/protobuf/protobuf-2.5.0.ebuild +++ b/dev-libs/protobuf/protobuf-2.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.ebuild,v 1.1 2013/03/05 05:21:45 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.2 2013/06/15 11:26:56 grobian Exp $ EAPI=5 JAVA_PKG_IUSE="source" @@ -14,7 +14,7 @@ SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="0/8" # subslot = soname major version -KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x64-macos ~x86-linux" +KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos x86-macos" IUSE="emacs examples java python static-libs vim-syntax" DEPEND="java? ( >=virtual/jdk-1.5 ) @@ -23,8 +23,11 @@ RDEPEND="java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs )" src_prepare() { - epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch - eautoreconf + if [[ ${CHOST} != *-darwin* ]] ; then + # breaks Darwin, bug #472514 + epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch + eautoreconf + fi if use python; then cd python && distutils-r1_src_prepare |