Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1273 from guillaume-d/guillaume-d/protobuf/fix-2.6.1

Browse source 
protobuf: Update version to 2.6.1
This commit is contained in:
Steven Barth 2015-05-21 07:40:20 +02:00
commit e02c7e81d0
3 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libs/protobuf/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007 OpenWrt.org # Copyright (C) 2007-2015 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,15 +8,18 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=protobuf PKG_NAME:=protobuf
PKG_VERSION:=2.5.0 PKG_VERSION:=2.6.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://protobuf.googlecode.com/files PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
PKG_MD5SUM:=a72001a9067a4c2c4e0e836d0f92ece4 PKG_MD5SUM:=11aaac2d704eef8efd1867a807865d85
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=protobuf/host 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 PKG_INSTALL:=1
@ -38,15 +41,7 @@ define Package/protobuf/description
of its internal RPC protocols and file formats. of its internal RPC protocols and file formats.
endef endef
define Host/Compile CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR_HOST)/bin/protoc
$(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
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) \ $(INSTALL_DIR) \

18
libs/protobuf/patches/001-mipseb-compile.patch
View file

@ -1,11 +1,11 @@
--- a/src/google/protobuf/stubs/platform_macros.h --- - 2015-05-19 16:27:29.770936016 +0200
+++ b/src/google/protobuf/stubs/platform_macros.h +++ protobuf-2.6.1/src/google/protobuf/stubs/platform_macros.h 2015-05-19 13:49:52.115444643 +0200
@@ -49,7 +49,7 @@ @@ -55,7 +55,7 @@
#elif defined(__ARMEL__) #elif defined(__aarch64__)
#define GOOGLE_PROTOBUF_ARCH_ARM 1 #define GOOGLE_PROTOBUF_ARCH_AARCH64 1
#define GOOGLE_PROTOBUF_ARCH_32_BIT 1 #define GOOGLE_PROTOBUF_ARCH_64_BIT 1
-#elif defined(__MIPSEL__) -#elif defined(__MIPSEL__)
+#elif defined(__MIPSEL__) || defined(__MIPSEB__) +#elif defined(__MIPSEL__) || defined(__MIPSEB__)
#define GOOGLE_PROTOBUF_ARCH_MIPS 1 #if defined(__LP64__)
#define GOOGLE_PROTOBUF_ARCH_32_BIT 1 #define GOOGLE_PROTOBUF_ARCH_MIPS64 1
#elif defined(__pnacl__) #define GOOGLE_PROTOBUF_ARCH_64_BIT 1

11
libs/protobuf/patches/003-mips2andHigher-compile.patch Normal file
View file

@ -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) {