lede-packages-rs

git clone git://archive.git.mtrnord.blog/MTRNord/lede-packages-rs.git
Log | Files | Refs | README | LICENSE

commit adc196457585ff6d4f1e515e70b8bac53f287623
parent c42ecd05a1c91070bc86b4d8254972562b6e0c67
Author: Per Sandström <per.j.sandstrom@gmail.com>
Date:   Sat, 11 Feb 2017 13:13:48 +0100

Protobuf: Upgrade to version 3.1

Signed-off-by: Per Sandström <per.j.sandstrom@gmail.com>

Diffstat:
Mlibs/protobuf/Makefile | 10+++++-----
Dlibs/protobuf/patches/001-mipseb-compile.patch | 11-----------
Dlibs/protobuf/patches/003-mips2andHigher-compile.patch | 11-----------
3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=protobuf -PKG_VERSION:=2.6.1 +PKG_VERSION:=3.1.0 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION) -PKG_MD5SUM:=11aaac2d704eef8efd1867a807865d85 +PKG_MD5SUM:=bd5e3eed635a8d32e2b99658633815ef PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE @@ -30,9 +30,9 @@ define Package/protobuf SECTION:=libs CATEGORY:=Libraries TITLE:=A structured data encoding library - URL:=http://code.google.com/p/protobuf/ + URL:=https://github.com/google/protobuf DEPENDS:=+zlib +libpthread +libstdcpp - MAINTAINER:=Jacob Siverskog <jacob@teenageengineering.com> + MAINTAINER:=Per Sandström <per.j.sandstrom@gmail.com> endef define Package/protobuf/description diff --git a/libs/protobuf/patches/001-mipseb-compile.patch b/libs/protobuf/patches/001-mipseb-compile.patch @@ -1,11 +0,0 @@ ---- - 2015-05-19 16:27:29.770936016 +0200 -+++ protobuf-2.6.1/src/google/protobuf/stubs/platform_macros.h 2015-05-19 13:49:52.115444643 +0200 -@@ -55,7 +55,7 @@ - #elif defined(__aarch64__) - #define GOOGLE_PROTOBUF_ARCH_AARCH64 1 - #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 --#elif defined(__MIPSEL__) -+#elif defined(__MIPSEL__) || defined(__MIPSEB__) - #if defined(__LP64__) - #define GOOGLE_PROTOBUF_ARCH_MIPS64 1 - #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 diff --git a/libs/protobuf/patches/003-mips2andHigher-compile.patch b/libs/protobuf/patches/003-mips2andHigher-compile.patch @@ -1,11 +0,0 @@ ---- - 2015-05-19 16:29:09.614344473 +0200 -+++ protobuf-2.6.1/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h 2015-05-19 13:49:52.127442746 +0200 -@@ -150,7 +150,7 @@ - } - - inline void MemoryBarrier() { -- __asm__ __volatile__("sync" : : : "memory"); -+ __asm__ __volatile__(".set mips2; sync; .set mips0" : : : "memory"); - } - - inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {