projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4aff2d4)
protobuf: fix musl build
authorBaruch Siach <baruch@tkos.co.il>
Thu, 27 Apr 2017 20:19:08 +0000 (23:19 +0300)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 29 Apr 2017 13:43:42 +0000 (15:43 +0200)
Add upstream patch fixing conflict with musl defined major/minor macros.

Fixes:
http://autobuild.buildroot.net/results/fc5/fc5ea266eecb6ecab011ea3542f0bb680fb8fb3b/
http://autobuild.buildroot.net/results/3b3/3b3fe16978f19e65a6c6dc1712d72cb349eed0d5/
http://autobuild.buildroot.net/results/1da/1dac9d5e49342700036c90ed4785fff7398b8966/

Cc: Mario J. Rugiero <mrugiero@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Mario J. Rugiero <mrugiero@gmail.com>
Tested-by: Mario J. Rugiero <mrugiero@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/protobuf/protobuf.hash patch | blob | history
package/protobuf/protobuf.mk patch | blob | history

diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash
index 9ec6bc759d8f185f0f04e3d914d4d61ad066f0e3..8c2ade37e7cd88b0db56110677ebda71a0e9314b 100644 (file)
--- a/package/protobuf/protobuf.hash
+++ b/package/protobuf/protobuf.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256 51d773e4297238b282eaa4c1dd317099675b12eef2b414732b851c00459225c6 protobuf-cpp-3.2.0.tar.gz
+sha256 da80c39838515913633f4cbd875fdd4ad711be95c83a50ff5096b9f1254033b3 416f90939d4de58fe1a4e2489120010313183291.patch
diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
index a3e96d4f898c79eb767aef651240dd778ca7ce37..610da8c04a94c9f7e8daa7b62562745a4a4e87b5 100644 (file)
--- a/package/protobuf/protobuf.mk
+++ b/package/protobuf/protobuf.mk
@@ -19,6 +19,8 @@ PROTOBUF_CONF_OPTS = --with-protoc=$(HOST_DIR)/usr/bin/protoc
 
 PROTOBUF_INSTALL_STAGING = YES
 
+PROTOBUF_PATCH = https://github.com/google/protobuf/commit/416f90939d4de58fe1a4e2489120010313183291.patch
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 PROTOBUF_DEPENDENCIES += zlib
 endif