Re: [ptxdist] [PATCH 3/5] host-squashfs-tools: add support for zstd contitional

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

On Thu, Jul 16, 2020 at 07:38:03PM +0200, Bruno Thomsen wrote:
> Only enable host zstd package dependency when needed,
> so it doesn't build unnecessary packages.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
>  rules/host-squashfs-tools.in   |  1 +
>  rules/host-squashfs-tools.make | 12 ++++++++++--
>  2 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/host-squashfs-tools.in b/rules/host-squashfs-tools.in
> index 4ac2fa1b0..5ea45120e 100644
> --- a/rules/host-squashfs-tools.in
> +++ b/rules/host-squashfs-tools.in
> @@ -5,4 +5,5 @@ config HOST_SQUASHFS_TOOLS
>  	select HOST_ZLIB
>  	select HOST_LIBLZO
>  	select HOST_XZ
> +	select HOST_ZSTD	if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
>  	default y if ALLYES
> diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make
> index 39a6d11e1..45d69ba8b 100644
> --- a/rules/host-squashfs-tools.make
> +++ b/rules/host-squashfs-tools.make
> @@ -21,8 +21,16 @@ HOST_SQUASHFS_TOOLS_SUBDIR	:= squashfs-tools
>  # Compile
>  # ----------------------------------------------------------------------------
>  
> -HOST_SQUASHFS_TOOLS_MAKE_OPT := LZO_SUPPORT=1 XZ_SUPPORT=1
> -HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz"
> +HOST_SQUASHFS_TOOLS_MAKE_OPT := \
> +	LZO_SUPPORT=1 \
> +	XZ_SUPPORT=1 \
> +	ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD,1,0)
> +
> +HOST_SQUASHFS_TOOLS_MAKE_ENV := \
> +	$(HOST_ENV) \
> +	EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz -L$(PTXDIST_SYSROOT_HOST)/usr/local/lib64" \
> +	CPPFLAGS="-I$(PTXDIST_SYSROOT_HOST)/usr/local/include"

The /usr/local paths should not be necessary with the fixed host-zstd
package.

Michael

> +
>  HOST_SQUASHFS_TOOLS_MAKE_PAR := NO
>  HOST_SQUASHFS_TOOLS_INSTALL_OPT = install INSTALL_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/sbin"
>  
> -- 
> 2.26.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de