[Buildroot] [PATCH v2 3/5] package/xz: determine all autoconf options

Arnout Vandecappelle arnout at mind.be
Mon Jun 24 13:44:33 UTC 2024



On 12/06/2024 15:57, Peter Seiderer via buildroot wrote:
> Determine all autoconf options (with default values) with the following
> special cases:
> 
> - sandbox: use 'auto' (which will compile detect landlock in case
>    kernel headers >= 5.13)
> 
> - unaligned-access: use 'auto' (which will default to yes for x86, x86-64,
>    powerpc, powerpc64 and powcerpc64le and use compile detection for arm,
>    aarch64 and riscv, see xz-5.6.0/configure line 21323 ff)
> 
> Signed-off-by: Peter Seiderer <ps.report at gmx.net>
> ---
> Changes v1 -> v2:
>    - remove '--enable-ifunc' (upstream removed)
> ---
>   package/xz/xz.mk | 39 +++++++++++++++++++++++++++++++++++++++
>   1 file changed, 39 insertions(+)
> 
> diff --git a/package/xz/xz.mk b/package/xz/xz.mk
> index 10590f6be8..e051ad0047 100644
> --- a/package/xz/xz.mk
> +++ b/package/xz/xz.mk
> @@ -13,6 +13,45 @@ XZ_LICENSE = Public Domain, BSD-0-Clause, GPL-2.0+, GPL-3.0+, LGPL-2.1+
>   XZ_LICENSE_FILES = COPYING COPYING.0BSD COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
>   XZ_CPE_ID_VENDOR = tukaani
>   
> +XZ_CONF_OPTS = \
> +	--enable-encoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv \
> +	--enable-decoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv \
> +	--enable-match-finders=hc3,hc4,bt2,bt3,bt4 \
> +	--enable-checks=crc32,crc64,sha256 \
> +	--disable-external-sha256 \
> +	--enable-microlzma \
> +	--enable-lzip-decoder \
> +	--enable-assembler \
> +	--enable-clmul-crc \
> +	--enable-arm64-crc32 \
> +	--disable-small \
> +	--enable-assume-ram=128 \
> +	--enable-xz \
> +	--enable-xzdec \
> +	--enable-lzmadec \
> +	--enable-lzmainfo \
> +	--enable-lzma-links \
> +	--enable-scripts \
> +	--enable-sandbox=auto \
> +	--enable-symbol-versions \
> +	--enable-rpath \
> +	--enable-largfile \
> +	--enable-unaligned-access=auto \
> +	--disable-unsafe-type-punning \
> +	--disable-werror \
> +	--disable-year2038
> +
> +HOST_XZ_CONF_OPTS = \
> +	$(XZ_CONF_OPTS) \

  Since the additional options added below will also be in here, I've moved this 
part down, after setting all the target conf opts. That avoids confusion of 
people thinking that there is no enable-nls or enable-threads in here.


> +	--enable-nls \
> +	--enable-threads
> +
> +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
> +XZ_CONF_OPTS += --enable-nls
> +else
> +Z_CONF_OPTS += --disable-nls

  Missing X here (fixed in a later patch).

  Applied to master, thanks.

  Regards,
  Arnout


> +endif
> +
>   ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
>   XZ_CONF_OPTS += --enable-threads
>   else


More information about the buildroot mailing list