Re: [ptxdist] [PATCH 18/22] protobuf: version bump 3.3.2 -> 3.5.1

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Tue, Jan 16, 2018 at 04:50:36PM +0100, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

This breaks python-protobuf. I think that needs to use a separate tarball?

Michael

> ---
>  patches/protobuf-3.3.2/autogen.sh | 1 -
>  rules/host-protobuf.make          | 1 +
>  rules/protobuf.make               | 7 ++++---
>  3 files changed, 5 insertions(+), 4 deletions(-)
>  delete mode 120000 patches/protobuf-3.3.2/autogen.sh
> 
> diff --git a/patches/protobuf-3.3.2/autogen.sh b/patches/protobuf-3.3.2/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7d..000000000
> --- a/patches/protobuf-3.3.2/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/rules/host-protobuf.make b/rules/host-protobuf.make
> index d65fe1020..be7aa5aaa 100644
> --- a/rules/host-protobuf.make
> +++ b/rules/host-protobuf.make
> @@ -23,6 +23,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_PROTOBUF) += host-protobuf
>  HOST_PROTOBUF_CONF_TOOL	:= autoconf
>  HOST_PROTOBUF_CONF_OPT	:= \
>  	$(HOST_AUTOCONF) \
> +	--disable-64bit-solaris \
>  	--disable-static \
>  	--without-zlib
>  
> diff --git a/rules/protobuf.make b/rules/protobuf.make
> index 34b1e3dd9..91d095964 100644
> --- a/rules/protobuf.make
> +++ b/rules/protobuf.make
> @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_PROTOBUF) += protobuf
>  #
>  # Paths and names
>  #
> -PROTOBUF_VERSION	:= 3.3.2
> -PROTOBUF_MD5		:= 19ed45d0cbbb88de2c4922978235d314 ef2a6a6bb3b92d8fa8d71e3cef741f2f
> +PROTOBUF_VERSION	:= 3.5.1
> +PROTOBUF_MD5		:= ca0d9b243e649d398a6b419acd35103a
>  PROTOBUF		:= protobuf-$(PROTOBUF_VERSION)
>  PROTOBUF_SUFFIX		:= tar.gz
> -PROTOBUF_URL		:= https://github.com/google/protobuf/archive/v$(PROTOBUF_VERSION).$(PROTOBUF_SUFFIX)
> +PROTOBUF_URL		:= https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).$(PROTOBUF_SUFFIX)
>  PROTOBUF_SOURCE		:= $(SRCDIR)/$(PROTOBUF).$(PROTOBUF_SUFFIX)
>  PROTOBUF_DIR		:= $(BUILDDIR)/$(PROTOBUF)
>  PROTOBUF_LICENSE	:= BSD-3-Clause
> @@ -35,6 +35,7 @@ PROTOBUF_LICENSE	:= BSD-3-Clause
>  PROTOBUF_CONF_TOOL	:= autoconf
>  PROTOBUF_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> +	--disable-64bit-solaris \
>  	--disable-static \
>  	--$(call ptx/wwo, PTXCONF_PROTOBUF_ZLIB)-zlib \
>  	--with-protoc=$(PTXDIST_SYSROOT_HOST)/bin/protoc
> -- 
> 2.15.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de