gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "protobuf: bump version to 2.6.0" 

This reverts commit 7b6304af9d, since it
causing too many build failures, with python-protobuf and
host-protobuf-c.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2014-10-06 09:22:54 +02:00
parent 441ff982fd
commit 61ae22810a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/protobuf/Config.in
View File

@ -3,16 +3,17 @@ config BR2_PACKAGE_PROTOBUF
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
# See src/google/protobuf/stubs/platform_macros.h for supported archs.
depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64 || BR2_powerpc
# PowerPC doesn't actually work.
depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64
# host-protobuf only builds on certain architectures
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
help
Protocol buffers are Google's language-neutral, platform-neutral,
extensible mechanism for serializing structured data.
https://github.com/google/protobuf/
http://code.google.com/p/protobuf/
comment "protobuf needs a toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64 || BR2_powerpc
depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"

4
package/protobuf/protobuf.mk
View File

@ -4,8 +4,8 @@
#
################################################################################
PROTOBUF_VERSION = 2.6.0
PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/
PROTOBUF_VERSION = 2.5.0
PROTOBUF_SITE = http://protobuf.googlecode.com/files
PROTOBUF_LICENSE = BSD-3c
PROTOBUF_LICENSE_FILES = COPYING.txt