From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jw7pk-0005Cx-Du for ptxdist@pengutronix.de; Thu, 16 Jul 2020 19:38:12 +0200 Received: by mail-ej1-x641.google.com with SMTP id w6so7478195ejq.6 for ; Thu, 16 Jul 2020 10:38:12 -0700 (PDT) From: Bruno Thomsen Date: Thu, 16 Jul 2020 19:38:03 +0200 Message-Id: <20200716173805.7467-3-bruno.thomsen@gmail.com> In-Reply-To: <20200716173805.7467-1-bruno.thomsen@gmail.com> References: <20200716173805.7467-1-bruno.thomsen@gmail.com> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 3/5] host-squashfs-tools: add support for zstd contitional List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Bruno Thomsen , bth@kamstrup.com Only enable host zstd package dependency when needed, so it doesn't build unnecessary packages. Signed-off-by: Bruno Thomsen --- 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" + 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