Contrib: update protobuf to 2.6.0

30fe07ba · Jean-Baptiste Kempf · 83047b67 · 30fe07ba · 30fe07ba
Commit 30fe07ba authored Oct 11, 2014 by Jean-Baptiste Kempf
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

contrib/src/protobuf/SHA512SUMS contrib/src/protobuf/SHA512SUMS +1 -1

contrib/src/protobuf/rules.mak contrib/src/protobuf/rules.mak +3 -3

No files found.
--- a/contrib/src/protobuf/SHA512SUMS
+++ b/contrib/src/protobuf/SHA512SUMS
-5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee  protobuf-2.5.0.tar.bz2
+a59a6d28d1653335fee42eff074f54b317d79d50361ed27d16502012ebb68bf7932ff80be4ce1588829940d6fdf77d113536ee3b27b72959577527ca488eddab  protobuf-2.6.0.tar.bz2
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
 # protobuf
-PROTOBUF_VERSION := 2.5.0
-PROTOBUF_URL := https://protobuf.googlecode.com/files/protobuf-$(PROTOBUF_VERSION).tar.bz2
+PROTOBUF_VERSION := 2.6.0
+PROTOBUF_URL := https://protobuf.googlecode.com/svn/rc/protobuf-$(PROTOBUF_VERSION).tar.bz2

 PKGS += protobuf
 ifeq ($(call need_pkg,"protobuf"),)
@@ -24,5 +24,5 @@ endif
 .protobuf: protobuf
 	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc=protoc
-	cd $< && $(MAKE) install
+	cd $< && $(MAKE) && $(MAKE) install
 	touch $@