diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-05-18 16:41:25 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-05-20 21:27:31 +0200 |
| commit | d429b84d6559c0e31cf45c453968ac9caee72aa3 (patch) | |
| tree | 5d21875b81d701836267a7eb123e5f2c89f6b008 /rules/protobuf.make | |
| parent | 4afc44d8551445ee7e65c3f8add069a61f96feb4 (diff) | |
| download | ptxdist-d429b84d6559c0e31cf45c453968ac9caee72aa3.tar.gz ptxdist-d429b84d6559c0e31cf45c453968ac9caee72aa3.tar.xz | |
protobuf: version bump 2.5.0 -> 3.3.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/protobuf.make')
| -rw-r--r-- | rules/protobuf.make | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/rules/protobuf.make b/rules/protobuf.make index 6f7178bd6..35d065b2d 100644 --- a/rules/protobuf.make +++ b/rules/protobuf.make @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_PROTOBUF) += protobuf # # Paths and names # -PROTOBUF_VERSION := 2.5.0 -PROTOBUF_MD5 := a72001a9067a4c2c4e0e836d0f92ece4 +PROTOBUF_VERSION := 3.3.1 +PROTOBUF_MD5 := 20c685147753b515ce380421442044b5 PROTOBUF := protobuf-$(PROTOBUF_VERSION) -PROTOBUF_SUFFIX := tar.bz2 -PROTOBUF_URL := http://protobuf.googlecode.com/files/$(PROTOBUF).$(PROTOBUF_SUFFIX) +PROTOBUF_SUFFIX := tar.gz +PROTOBUF_URL := https://github.com/google/protobuf/archive/v$(PROTOBUF_VERSION).$(PROTOBUF_SUFFIX) PROTOBUF_SOURCE := $(SRCDIR)/$(PROTOBUF).$(PROTOBUF_SUFFIX) PROTOBUF_DIR := $(BUILDDIR)/$(PROTOBUF) PROTOBUF_LICENSE := BSD-3-Clause @@ -29,17 +29,6 @@ PROTOBUF_LICENSE := BSD-3-Clause # Prepare # ---------------------------------------------------------------------------- -PROTOBUF_CONF_ENV := \ - $(CROSS_ENV) - -ifdef PTXCONF_ARCH_PPC -# protobuf-2.5.0 has no atomics for PPC -# abuse PTHREAD_* because those flags a propagated via protobuf.pc -PROTOBUF_CONF_ENV += \ - PTHREAD_LIBS="-lpthread" \ - PTHREAD_CFLAGS="-DGOOGLE_PROTOBUF_NO_THREAD_SAFETY" -endif - # # autoconf # |