protobuf-c compiles fine without a dependency on the host protobuf-c. Therefore remove the dependency.
The license md5sum changed due to an updated year. Signed-off-by: Sven Püschel <[email protected]> --- rules/host-protobuf-c.make | 7 ++++++- rules/protobuf-c.in | 1 - rules/protobuf-c.make | 12 ++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/rules/host-protobuf-c.make b/rules/host-protobuf-c.make index c63134ff0..da2742872 100644 --- a/rules/host-protobuf-c.make +++ b/rules/host-protobuf-c.make @@ -17,6 +17,11 @@ HOST_PACKAGES-$(PTXCONF_HOST_PROTOBUF_C) += host-protobuf-c HOST_PROTOBUF_C_CONF_TOOL := autoconf HOST_PROTOBUF_C_CONF_OPT := \ $(HOST_AUTOCONF) \ - --disable-static + $(GLOBAL_LARGE_FILE_OPTION) \ + --disable-static \ + --enable-protoc \ + --disable-valgrind-tests \ + --disable-code-coverage \ + --$(call ptx/endis, PTXDIST_Y2038)-year2038 # vim: syntax=make diff --git a/rules/protobuf-c.in b/rules/protobuf-c.in index 921f70471..0258c6ffa 100644 --- a/rules/protobuf-c.in +++ b/rules/protobuf-c.in @@ -2,7 +2,6 @@ config PROTOBUF_C tristate - select HOST_PROTOBUF_C prompt "protobuf-c " help A C implementation of the Protocol Buffers data serialization diff --git a/rules/protobuf-c.make b/rules/protobuf-c.make index 60f7f6494..2131a75b7 100644 --- a/rules/protobuf-c.make +++ b/rules/protobuf-c.make @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_PROTOBUF_C) += protobuf-c # # Paths and names # -PROTOBUF_C_VERSION := 1.4.1 -PROTOBUF_C_MD5 := 4c17d70317ce9fc4cca9690377284659 +PROTOBUF_C_VERSION := 1.5.2 +PROTOBUF_C_MD5 := 0612ee47cccaaf4ad1c4f0c8bdc13abf PROTOBUF_C := protobuf-c-$(PROTOBUF_C_VERSION) PROTOBUF_C_SUFFIX := tar.gz PROTOBUF_C_URL := https://github.com/protobuf-c/protobuf-c/releases/download/v$(PROTOBUF_C_VERSION)/protobuf-c-$(PROTOBUF_C_VERSION).$(PROTOBUF_C_SUFFIX) PROTOBUF_C_SOURCE := $(SRCDIR)/$(PROTOBUF_C).$(PROTOBUF_C_SUFFIX) PROTOBUF_C_DIR := $(BUILDDIR)/$(PROTOBUF_C) PROTOBUF_C_LICENSE := BSD-2-Clause -PROTOBUF_C_LICENSE_FILES := file://LICENSE;md5=9f725889e0d77383e26cb42b0b62cea2 +PROTOBUF_C_LICENSE_FILES := file://LICENSE;md5=bd8de4f63e06b1ccc06e9f8dc5b1aa97 # ---------------------------------------------------------------------------- # Prepare @@ -34,8 +34,12 @@ PROTOBUF_C_LICENSE_FILES := file://LICENSE;md5=9f725889e0d77383e26cb42b0b62cea2 PROTOBUF_C_CONF_TOOL := autoconf PROTOBUF_C_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + $(GLOBAL_LARGE_FILE_OPTION) \ + --disable-static \ --disable-protoc \ - --disable-static + --disable-valgrind-tests \ + --disable-code-coverage \ + --$(call ptx/endis, PTXDIST_Y2038)-year2038 # ---------------------------------------------------------------------------- # Target-Install -- 2.47.3
