diff options
| -rw-r--r-- | libs/protobuf/Makefile | 18 | ||||
| -rw-r--r-- | libs/protobuf/patches/001-mipseb-compile.patch | 18 | ||||
| -rw-r--r-- | libs/protobuf/patches/003-mips2andHigher-compile.patch | 11 |
3 files changed, 25 insertions, 22 deletions
diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile index ceb304828..4f45183e2 100644 --- a/libs/protobuf/Makefile +++ b/libs/protobuf/Makefile @@ -8,18 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=protobuf -PKG_VERSION:=2.5.0 +PKG_VERSION:=2.6.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://protobuf.googlecode.com/files -PKG_MD5SUM:=a72001a9067a4c2c4e0e836d0f92ece4 +PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION) +PKG_MD5SUM:=11aaac2d704eef8efd1867a807865d85 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DEPENDS:=protobuf/host -PKG_USE_MIPS16:=0 +PKG_USE_MIPS16:=0# MIPS16 prevents protobuf's usage of the 'sync' asm-opcode PKG_INSTALL:=1 @@ -41,15 +41,7 @@ define Package/protobuf/description of its internal RPC protocols and file formats. endef -define Host/Compile - $(MAKE) -C $(HOST_BUILD_DIR) -endef - -define Host/Install - $(MAKE) -C $(HOST_BUILD_DIR) install -endef - -CONFIGURE_ARGS += --with-protoc=$(HOST_BUILD_DIR)/src/protoc +CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR_HOST)/bin/protoc define Build/InstallDev $(INSTALL_DIR) \ diff --git a/libs/protobuf/patches/001-mipseb-compile.patch b/libs/protobuf/patches/001-mipseb-compile.patch index 6eb059000..f57683396 100644 --- a/libs/protobuf/patches/001-mipseb-compile.patch +++ b/libs/protobuf/patches/001-mipseb-compile.patch @@ -1,11 +1,11 @@ ---- a/src/google/protobuf/stubs/platform_macros.h -+++ b/src/google/protobuf/stubs/platform_macros.h -@@ -49,7 +49,7 @@ - #elif defined(__ARMEL__) - #define GOOGLE_PROTOBUF_ARCH_ARM 1 - #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 +--- - 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__) - #define GOOGLE_PROTOBUF_ARCH_MIPS 1 - #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 - #elif defined(__pnacl__) + #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 new file mode 100644 index 000000000..df9792894 --- /dev/null +++ b/libs/protobuf/patches/003-mips2andHigher-compile.patch @@ -0,0 +1,11 @@ +--- - 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) { |