diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-10-23 02:41:49 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-12-01 20:51:36 (GMT) |
| commit | 08d8094f3a6791f64f1503d96e4456e06ba646ef (patch) | |
| tree | fddc8fed2d821244b7c8f0c21826c2ca94f7e1f3 /src | |
| parent | c3df5c53be2ae2a3e20d4df804715d25d45d6059 (diff) | |
| download | mxe-08d8094f3a6791f64f1503d96e4456e06ba646ef.zip mxe-08d8094f3a6791f64f1503d96e4456e06ba646ef.tar.gz mxe-08d8094f3a6791f64f1503d96e4456e06ba646ef.tar.bz2 | |
Revert "protobuf: use official release tarball instead of tarball from git tag"
This reverts commit 284f0a7ec3b43c0a918e3d5c85dc19f3ca561962.
New protobuf release (3.1.0) does not provide official
tarballs with prepared configure and googletest files.
Tag (and URL) changed since original version. Now tag start with 'v'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/protobuf.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/protobuf.mk b/src/protobuf.mk index d3b87d3..4a8cfe0 100644 --- a/src/protobuf.mk +++ b/src/protobuf.mk @@ -3,19 +3,21 @@ PKG := protobuf $(PKG)_IGNORE := $(PKG)_VERSION := 2.6.1 -$(PKG)_CHECKSUM := dbbd7bdd2381633995404de65a945ff1a7610b0da14593051b4738c90c6dd164 +$(PKG)_CHECKSUM := 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/google/protobuf/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib +$(PKG)_URL := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc zlib googletest define $(PKG)_UPDATE $(call MXE_GET_GITHUB_TAGS, google/protobuf, v) endef define $(PKG)_BUILD + $(call PREPARE_PKG_SOURCE,googletest,$(1)) + cd '$(1)' && mv googletest-release-$(googletest_VERSION)/ gtest # First step: Build for host system in order to create "protoc" binary. - cd '$(1)' && ./configure \ + cd '$(1)' && ./autogen.sh && ./configure \ --disable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' cp '$(1)/src/protoc' '$(PREFIX)/bin/$(TARGET)-protoc' |