From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jyzyW-000831-Vf for ptxdist@pengutronix.de; Fri, 24 Jul 2020 17:51:09 +0200 Received: by mail-wm1-x341.google.com with SMTP id o2so8700137wmh.2 for ; Fri, 24 Jul 2020 08:51:08 -0700 (PDT) From: Bruno Thomsen Date: Fri, 24 Jul 2020 17:51:00 +0200 Message-Id: <20200724155103.6374-2-bruno.thomsen@gmail.com> In-Reply-To: <20200724155103.6374-1-bruno.thomsen@gmail.com> References: <20200724155103.6374-1-bruno.thomsen@gmail.com> MIME-Version: 1.0 Subject: [ptxdist] [PATCH v3 2/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 --- Changes since version 2: Moved from 0003 to 0002. Added HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT config. Changes since version 1: Removed all /usr/local paths changes in HOST_SQUASHFS_TOOLS_MAKE_ENV. This looks cleaner :) rules/host-squashfs-tools.in | 8 ++++++++ rules/host-squashfs-tools.make | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/rules/host-squashfs-tools.in b/rules/host-squashfs-tools.in index 4ac2fa1b0..04de7d1fc 100644 --- a/rules/host-squashfs-tools.in +++ b/rules/host-squashfs-tools.in @@ -5,4 +5,12 @@ config HOST_SQUASHFS_TOOLS select HOST_ZLIB select HOST_LIBLZO select HOST_XZ + select HOST_ZSTD if HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT default y if ALLYES + +if HOST_SQUASHFS_TOOLS + +config HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT + bool + +endif diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make index 39a6d11e1..42b48b2c5 100644 --- a/rules/host-squashfs-tools.make +++ b/rules/host-squashfs-tools.make @@ -21,7 +21,11 @@ HOST_SQUASHFS_TOOLS_SUBDIR := squashfs-tools # Compile # ---------------------------------------------------------------------------- -HOST_SQUASHFS_TOOLS_MAKE_OPT := LZO_SUPPORT=1 XZ_SUPPORT=1 +HOST_SQUASHFS_TOOLS_MAKE_OPT := \ + LZO_SUPPORT=1 \ + XZ_SUPPORT=1 \ + ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT,1,0) + HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz" 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