[Buildroot] [PATCH v2 1/5] package/xz: bump version to 5.4.7

[Buildroot] [PATCH v2 1/5] package/xz: bump version to 5.4.7

[Peter Seiderer via buildroot]

- add key hint for download signature check
- update COPYING hash due to [1] (change of home page URL)

For details see [2].

[1] https://github.com/tukaani-project/xz/commit/c5c091332c6953a0ce940cb355ea9e99491429fc

[2] https://github.com/tukaani-project/xz/releases/tag/v5.4.7

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changelog v1 -> v2:
  - new patch, bump old stable version
---
 package/xz/xz.hash | 8 +++++---
 package/xz/xz.mk   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/xz/xz.hash b/package/xz/xz.hash
index e8025a8065..ff070f6775 100644
--- a/package/xz/xz.hash
+++ b/package/xz/xz.hash
@@ -1,9 +1,11 @@
 # Locally calculated after checking pgp signature
-# https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.bz2.sig
-sha256  913851b274e8e1d31781ec949f1c23e8dbcf0ecf6e73a2436dc21769dd3e6f49  xz-5.4.6.tar.bz2
+# https://github.com/tukaani-project/xz/releases/download/v5.4.7/xz-5.4.7.tar.bz2.sig
+# using key 3690C240CE51B4670D30AD1C38EE757D69184620 Lasse Collin <lasse.collin@tukaani.org>
+
+sha256  9976ed9cd0764e962d852d7d519ee1c3a7f87aca3b86e5d021a45650ba3ecb41  xz-5.4.7.tar.bz2
 
 # Hash for license files
-sha256  29a1e305b2e34eefe5d4602d00cde1d528b71c5d9f2eec5106972cf6ddb6f73f  COPYING
+sha256  72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e  COPYING
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING.GPLv2
 sha256  3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  COPYING.GPLv3
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPLv2.1
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index 40fa59ca7c..d5dceb0eae 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XZ_VERSION = 5.4.6
+XZ_VERSION = 5.4.7
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)
 XZ_INSTALL_STAGING = YES
-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 2/5] package/xz: bump version to 5.6.2

[Peter Seiderer via buildroot]

- bump version to 5.6.2
- add BSD-0-Clause and update license file hash accordingly (see [1], [2], [3],
  [4], [5], [6], [7] and [8])

For details see [9].

[1] https://github.com/tukaani-project/xz/commit/b1ee6cf259bb49ce91abe9f622294524e37edf4c
[2] https://github.com/tukaani-project/xz/commit/689e0228baeb95232430e90d628379db89583d71
[3] https://github.com/tukaani-project/xz/commit/28ce45e38fbed4b5f54f2013e38dab47d22bf699
[4] https://github.com/tukaani-project/xz/commit/17aa2e1a796d3f758802df29afc89dcf335db567
[5] https://github.com/tukaani-project/xz/commit/bfd0c7c478e93a1911b845459549ff94587b6ea2
[6] https://github.com/tukaani-project/xz/commit/fd7faa4c338a42a6a40e854b837d285ae2e8c609
[7] https://github.com/tukaani-project/xz/commit/62733592a1cc6f0b41f46ef52e06d1a6fe1ff38a
[8] https://github.com/tukaani-project/xz/commit/6bbec3bda02bf87d24fa095074456e723589921f
[9] https://github.com/tukaani-project/xz/releases/tag/v5.6.2

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
  - bump version to first one after the backdoor incident
  - omit homepage URL change (reverted upstream)

Notes:
  - while searching the history, detected an previously/alterantive patch
    for the initial version bump by Julien Olivain, see
    http://lists.busybox.net/pipermail/buildroot/2024-February/371577.html
---
 package/xz/xz.hash | 8 ++++----
 package/xz/xz.mk   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/xz/xz.hash b/package/xz/xz.hash
index ff070f6775..6012e1001b 100644
--- a/package/xz/xz.hash
+++ b/package/xz/xz.hash
@@ -1,11 +1,11 @@
 # Locally calculated after checking pgp signature
-# https://github.com/tukaani-project/xz/releases/download/v5.4.7/xz-5.4.7.tar.bz2.sig
+# https://github.com/tukaani-project/xz/releases/download/v5.6.2/xz-5.6.2.tar.bz2.sig
 # using key 3690C240CE51B4670D30AD1C38EE757D69184620 Lasse Collin <lasse.collin@tukaani.org>
-
-sha256  9976ed9cd0764e962d852d7d519ee1c3a7f87aca3b86e5d021a45650ba3ecb41  xz-5.4.7.tar.bz2
+sha256  e12aa03cbd200597bd4ce11d97be2d09a6e6d39a9311ce72c91ac7deacde3171  xz-5.6.2.tar.bz2
 
 # Hash for license files
-sha256  72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e  COPYING
+sha256  ee3b35b82f7bb0ba5fd9f13ca34ebbe757a59c05bfde5ab9d50ff4188ed33396  COPYING
+sha256  0b01625d853911cd0e2e088dcfb743261034a091bb379246cb25a14cc4c74bf1  COPYING.0BSD
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING.GPLv2
 sha256  3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  COPYING.GPLv3
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPLv2.1
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index d5dceb0eae..10590f6be8 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-XZ_VERSION = 5.4.7
+XZ_VERSION = 5.6.2
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)
 XZ_INSTALL_STAGING = YES
 XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+
-XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
+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
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 2/5] package/xz: bump version to 5.6.2

[Julien Olivain]

   Hi Peter,

On 12/06/2024 13:57, Peter Seiderer via buildroot wrote:
> - bump version to 5.6.2
> - add BSD-0-Clause and update license file hash accordingly (see [1], 
> [2], [3],
>   [4], [5], [6], [7] and [8])
> 
> For details see [9].
> 
> [1] 
> https://github.com/tukaani-project/xz/commit/b1ee6cf259bb49ce91abe9f622294524e37edf4c
> [2] 
> https://github.com/tukaani-project/xz/commit/689e0228baeb95232430e90d628379db89583d71
> [3] 
> https://github.com/tukaani-project/xz/commit/28ce45e38fbed4b5f54f2013e38dab47d22bf699
> [4] 
> https://github.com/tukaani-project/xz/commit/17aa2e1a796d3f758802df29afc89dcf335db567
> [5] 
> https://github.com/tukaani-project/xz/commit/bfd0c7c478e93a1911b845459549ff94587b6ea2
> [6] 
> https://github.com/tukaani-project/xz/commit/fd7faa4c338a42a6a40e854b837d285ae2e8c609
> [7] 
> https://github.com/tukaani-project/xz/commit/62733592a1cc6f0b41f46ef52e06d1a6fe1ff38a
> [8] 
> https://github.com/tukaani-project/xz/commit/6bbec3bda02bf87d24fa095074456e723589921f
> [9] https://github.com/tukaani-project/xz/releases/tag/v5.6.2
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Changes v1 -> v2:
>   - bump version to first one after the backdoor incident
>   - omit homepage URL change (reverted upstream)
> 
> Notes:
>   - while searching the history, detected an previously/alterantive 
> patch
>     for the initial version bump by Julien Olivain, see
>     
> http://lists.busybox.net/pipermail/buildroot/2024-February/371577.html

I confirm I initially proposed a bump to xz 5.6.0. I marked the
patch as "Rejected" the day of the XZ backdoor announce.

On that matter, I would suggest to add a note on commit logs
about this security incident. Basically, your version bumps
from 5.4.6 -> 5.4.7 and 5.4.7 -> 5.6.2 are jumping over the
known backdoored versions (which are 5.6.0 and 5.6.1). So
Buildroot has never been impacted by this issue (without and
with this patch).

See:
https://tukaani.org/xz-backdoor/
https://cve.mitre.org/cgi-bin/cvename.cgi?name=2024-3094

> ---
>  package/xz/xz.hash | 8 ++++----
>  package/xz/xz.mk   | 6 +++---
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/package/xz/xz.hash b/package/xz/xz.hash
> index ff070f6775..6012e1001b 100644
> --- a/package/xz/xz.hash
> +++ b/package/xz/xz.hash
> @@ -1,11 +1,11 @@
>  # Locally calculated after checking pgp signature
> -# 
> https://github.com/tukaani-project/xz/releases/download/v5.4.7/xz-5.4.7.tar.bz2.sig
> +# 
> https://github.com/tukaani-project/xz/releases/download/v5.6.2/xz-5.6.2.tar.bz2.sig
>  # using key 3690C240CE51B4670D30AD1C38EE757D69184620 Lasse Collin 
> <lasse.collin@tukaani.org>
> -
> -sha256  
> 9976ed9cd0764e962d852d7d519ee1c3a7f87aca3b86e5d021a45650ba3ecb41  
> xz-5.4.7.tar.bz2
> +sha256  
> e12aa03cbd200597bd4ce11d97be2d09a6e6d39a9311ce72c91ac7deacde3171  
> xz-5.6.2.tar.bz2
> 
>  # Hash for license files
> -sha256  
> 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e  
> COPYING
> +sha256  
> ee3b35b82f7bb0ba5fd9f13ca34ebbe757a59c05bfde5ab9d50ff4188ed33396  
> COPYING
> +sha256  
> 0b01625d853911cd0e2e088dcfb743261034a091bb379246cb25a14cc4c74bf1  
> COPYING.0BSD
>  sha256  
> 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  
> COPYING.GPLv2
>  sha256  
> 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  
> COPYING.GPLv3
>  sha256  
> dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  
> COPYING.LGPLv2.1
> diff --git a/package/xz/xz.mk b/package/xz/xz.mk
> index d5dceb0eae..10590f6be8 100644
> --- a/package/xz/xz.mk
> +++ b/package/xz/xz.mk
> @@ -4,13 +4,13 @@
>  #
>  
> ################################################################################
> 
> -XZ_VERSION = 5.4.7
> +XZ_VERSION = 5.6.2
>  XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
>  XZ_SITE = 
> https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)
>  XZ_INSTALL_STAGING = YES
>  XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
> -XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+
> -XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 
> COPYING.LGPLv2.1
> +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
> 
>  ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
> --
> 2.45.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 2/5] package/xz: bump version to 5.6.2

[Arnout Vandecappelle via buildroot]

On 12/06/2024 15:57, Peter Seiderer via buildroot wrote:
> - bump version to 5.6.2
> - add BSD-0-Clause and update license file hash accordingly (see [1], [2], [3],
>    [4], [5], [6], [7] and [8])

  As suggested by Julien, I added a statement to explain that this is not 
affected by the backdoor.

  Applied to master, thanks.

  Regards,
  Arnout

> 
> For details see [9].
> 
> [1] https://github.com/tukaani-project/xz/commit/b1ee6cf259bb49ce91abe9f622294524e37edf4c
> [2] https://github.com/tukaani-project/xz/commit/689e0228baeb95232430e90d628379db89583d71
> [3] https://github.com/tukaani-project/xz/commit/28ce45e38fbed4b5f54f2013e38dab47d22bf699
> [4] https://github.com/tukaani-project/xz/commit/17aa2e1a796d3f758802df29afc89dcf335db567
> [5] https://github.com/tukaani-project/xz/commit/bfd0c7c478e93a1911b845459549ff94587b6ea2
> [6] https://github.com/tukaani-project/xz/commit/fd7faa4c338a42a6a40e854b837d285ae2e8c609
> [7] https://github.com/tukaani-project/xz/commit/62733592a1cc6f0b41f46ef52e06d1a6fe1ff38a
> [8] https://github.com/tukaani-project/xz/commit/6bbec3bda02bf87d24fa095074456e723589921f
> [9] https://github.com/tukaani-project/xz/releases/tag/v5.6.2
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Changes v1 -> v2:
>    - bump version to first one after the backdoor incident
>    - omit homepage URL change (reverted upstream)
> 
> Notes:
>    - while searching the history, detected an previously/alterantive patch
>      for the initial version bump by Julien Olivain, see
>      http://lists.busybox.net/pipermail/buildroot/2024-February/371577.html
> ---
>   package/xz/xz.hash | 8 ++++----
>   package/xz/xz.mk   | 6 +++---
>   2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/package/xz/xz.hash b/package/xz/xz.hash
> index ff070f6775..6012e1001b 100644
> --- a/package/xz/xz.hash
> +++ b/package/xz/xz.hash
> @@ -1,11 +1,11 @@
>   # Locally calculated after checking pgp signature
> -# https://github.com/tukaani-project/xz/releases/download/v5.4.7/xz-5.4.7.tar.bz2.sig
> +# https://github.com/tukaani-project/xz/releases/download/v5.6.2/xz-5.6.2.tar.bz2.sig
>   # using key 3690C240CE51B4670D30AD1C38EE757D69184620 Lasse Collin <lasse.collin@tukaani.org>
> -
> -sha256  9976ed9cd0764e962d852d7d519ee1c3a7f87aca3b86e5d021a45650ba3ecb41  xz-5.4.7.tar.bz2
> +sha256  e12aa03cbd200597bd4ce11d97be2d09a6e6d39a9311ce72c91ac7deacde3171  xz-5.6.2.tar.bz2
>   
>   # Hash for license files
> -sha256  72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e  COPYING
> +sha256  ee3b35b82f7bb0ba5fd9f13ca34ebbe757a59c05bfde5ab9d50ff4188ed33396  COPYING
> +sha256  0b01625d853911cd0e2e088dcfb743261034a091bb379246cb25a14cc4c74bf1  COPYING.0BSD
>   sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING.GPLv2
>   sha256  3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  COPYING.GPLv3
>   sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPLv2.1
> diff --git a/package/xz/xz.mk b/package/xz/xz.mk
> index d5dceb0eae..10590f6be8 100644
> --- a/package/xz/xz.mk
> +++ b/package/xz/xz.mk
> @@ -4,13 +4,13 @@
>   #
>   ################################################################################
>   
> -XZ_VERSION = 5.4.7
> +XZ_VERSION = 5.6.2
>   XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
>   XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)
>   XZ_INSTALL_STAGING = YES
>   XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
> -XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+
> -XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
> +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
>   
>   ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Peter Seiderer via buildroot]

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@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) \
+	--enable-nls \
+	--enable-threads
+
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
+XZ_CONF_OPTS += --enable-nls
+else
+Z_CONF_OPTS += --disable-nls
+endif
+
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 XZ_CONF_OPTS += --enable-threads
 else
-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Arnout Vandecappelle via buildroot]

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@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
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 4/5] package/xz: enable year2038 option

[Peter Seiderer via buildroot]

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Notes:

- From autoconf-2.72 release notes ([1]):
  *** Support for ensuring time_t is Y2038-safe
  configure can now ensure that time_t can represent moments in time
  after 18 January 2038, i.e. 2**31 - 1 seconds after the Unix epoch.
  On most 64-bit systems this is true by default; the new feature
  is detection of systems where time_t is a 32-bit signed integer by
  default, *and* there is an alternative mode in which it is larger,
  in which case that mode will be enabled.

  In this release, all configure scripts that use AC_SYS_LARGEFILE
  gain a new command line option --enable-year2038.  When this option
  is used, the configure script will check for and enable support for
  a large time_t.

  This release also adds two new macros, AC_SYS_YEAR2038 and
  AC_SYS_YEAR2038_RECOMMENDED.  Both have all the effects of
  AC_SYS_LARGEFILE.  (This is because it is not possible to enlarge
  time_t without also enlarging off_t, on any system we are aware of.)

  AC_SYS_YEAR2038 additionally flips the default for --enable-year2038;
  a configure script that uses this macro will check for and enable
  support for a large time_t by default, but this can be turned off by
  using --disable-year2038.  AC_SYS_YEAR2038_RECOMMENDED goes even
  further, and makes the configure script fail on systems that do not
  seem to support timestamps after 18 January 2038 at all.  This
  failure can be suppressed by using --disable-year2038.

  Changing the size of time_t can change a library`s ABI.  Therefore,
  application and library builders should take care that all packages
  are configured with consistent use of --enable-year2038 or
  --disable-year2038, to ensure binary compatibility.  This is similar
  to longstanding consistency requirements with --enable-largefile and
  --disable-largefile.

  In this release, these macros only know how to enlarge time_t on two
  classes of systems: 32-bit MinGW, and any system where time_t can be
  enlarged by defining the preprocessor macro _TIME_BITS with the
  value 64.  At the time this NEWS entry was written, only GNU libc
  (version 2.34 and later) supported the latter macro.  Authors of
  other C libraries with a 32-bit time_t are encouraged to adopt
  _TIME_BITS, rather than inventing a different way to enlarge time_t.

- In buildroot there is already the BR2_TIME_BITS_64 config option
  ('Build Y2038-ready code'), which enables a system wide
  '-D_TIME_BITS=64' compile flag (and maybe should additional set
  '--enable-year2039' configure option for the autotools-packages?).
---
 package/xz/xz.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index e051ad0047..d81d0cf4ce 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -39,7 +39,7 @@ XZ_CONF_OPTS = \
 	--enable-unaligned-access=auto \
 	--disable-unsafe-type-punning \
 	--disable-werror \
-	--disable-year2038
+	--enable-year2038
 
 HOST_XZ_CONF_OPTS = \
 	$(XZ_CONF_OPTS) \
-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 4/5] package/xz: enable year2038 option

[Arnout Vandecappelle via buildroot]

On 12/06/2024 15:57, Peter Seiderer via buildroot wrote:
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Notes:
> 
> - From autoconf-2.72 release notes ([1]):
>    *** Support for ensuring time_t is Y2038-safe
>    configure can now ensure that time_t can represent moments in time
>    after 18 January 2038, i.e. 2**31 - 1 seconds after the Unix epoch.
>    On most 64-bit systems this is true by default; the new feature
>    is detection of systems where time_t is a 32-bit signed integer by
>    default, *and* there is an alternative mode in which it is larger,
>    in which case that mode will be enabled.
> 
>    In this release, all configure scripts that use AC_SYS_LARGEFILE
>    gain a new command line option --enable-year2038.  When this option
>    is used, the configure script will check for and enable support for
>    a large time_t.
> 
>    This release also adds two new macros, AC_SYS_YEAR2038 and
>    AC_SYS_YEAR2038_RECOMMENDED.  Both have all the effects of
>    AC_SYS_LARGEFILE.  (This is because it is not possible to enlarge
>    time_t without also enlarging off_t, on any system we are aware of.)
> 
>    AC_SYS_YEAR2038 additionally flips the default for --enable-year2038;
>    a configure script that uses this macro will check for and enable
>    support for a large time_t by default, but this can be turned off by
>    using --disable-year2038.  AC_SYS_YEAR2038_RECOMMENDED goes even
>    further, and makes the configure script fail on systems that do not
>    seem to support timestamps after 18 January 2038 at all.  This
>    failure can be suppressed by using --disable-year2038.
> 
>    Changing the size of time_t can change a library`s ABI.  Therefore,
>    application and library builders should take care that all packages
>    are configured with consistent use of --enable-year2038 or
>    --disable-year2038, to ensure binary compatibility.  This is similar
>    to longstanding consistency requirements with --enable-largefile and
>    --disable-largefile.
> 
>    In this release, these macros only know how to enlarge time_t on two
>    classes of systems: 32-bit MinGW, and any system where time_t can be
>    enlarged by defining the preprocessor macro _TIME_BITS with the
>    value 64.  At the time this NEWS entry was written, only GNU libc
>    (version 2.34 and later) supported the latter macro.  Authors of
>    other C libraries with a 32-bit time_t are encouraged to adopt
>    _TIME_BITS, rather than inventing a different way to enlarge time_t.
> 
> - In buildroot there is already the BR2_TIME_BITS_64 config option
>    ('Build Y2038-ready code'), which enables a system wide
>    '-D_TIME_BITS=64' compile flag (and maybe should additional set
>    '--enable-year2039' configure option for the autotools-packages?).
> ---
>   package/xz/xz.mk | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/xz/xz.mk b/package/xz/xz.mk
> index e051ad0047..d81d0cf4ce 100644
> --- a/package/xz/xz.mk
> +++ b/package/xz/xz.mk
> @@ -39,7 +39,7 @@ XZ_CONF_OPTS = \
>   	--enable-unaligned-access=auto \
>   	--disable-unsafe-type-punning \
>   	--disable-werror \
> -	--disable-year2038
> +	--enable-year2038

  Given that the next commit removes this option again, it's a bit useless to 
add it here. Perhaps it's still useful if the next commit gets reverted.


  Applied to master anyway, thanks.

  Regards,
  Arnout


>   
>   HOST_XZ_CONF_OPTS = \
>   	$(XZ_CONF_OPTS) \
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 5/5] package/xz: convert to cmake build

[Peter Seiderer via buildroot]

Convert to cmake build with the following autoconf options without
direct equivalent cmake option:

- '--disable-external-sha256'

- '--enable-assembler'

- '--enable-assume-ram=128': hard coded in the CMakeLists.txt file
  1732     target_compile_definitions(xz PRIVATE ASSUME_RAM=128)

- '--enable-scripts' (see [1]: 'CMake: xzdiff, xzgrep, xzless, xzmore, and
  their symlinks are now installed')

- '--enable-symbol-versions': hard coded in the CMakeLists.txt file
  1297     target_compile_definitions(liblzma PRIVATE HAVE_SYMBOL_VERSIONS_LINUX=1)

- '--enable-rpath'

- '--enable-largefile': see CMakeLists.txt
  245 # Check for large file support. It's required on some 32-bit platforms and
  246 # even on 64-bit MinGW-w64 to get 64-bit off_t. This can be forced off on
  247 # the CMake command line if needed: -DLARGE_FILE_SUPPORT=OFF
  248 tuklib_large_file_support(ALL)

- '--enable-unaligned-access=auto': see CMakeLists.txt and cmake/tuklib_integer.cmake
   250 # This is needed by liblzma and xz.
   251 tuklib_integer(ALL)

- '--disable-unsafe-type-punning' see CMakeLists.txt and cmake/tuklib_integer.cmake
   250 # This is needed by liblzma and xz.
   251 tuklib_integer(ALL)

- '--disable-werror'

- '--enable-year2038'

[1] https://github.com/tukaani-project/xz/releases/tag/v5.6.0

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
 - remove '-DUSE_ATTR_IFUNC=ON' (upstream removed)
 - adjust CMakeLists.txt reference line numbers
---
 package/xz/xz.mk | 57 +++++++++++++++++++-----------------------------
 1 file changed, 22 insertions(+), 35 deletions(-)

diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index d81d0cf4ce..6f8a564887 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -8,54 +8,41 @@ XZ_VERSION = 5.6.2
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)
 XZ_INSTALL_STAGING = YES
-XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 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 \
-	--enable-year2038
+	-DENCODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \
+	-DDECODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \
+	-DMATCH_FINDERS="hc3;hc4;bt2;bt3;bt4" \
+	-DADDITIONAL_CHECK_TYPES="crc64;sha256" \
+	-DMICROLZMA_ENCODER=ON \
+	-DMICROLZMA_DECODER=ON \
+	-DLZIP_DECODER=ON \
+	-DALLOW_CLMUL_CRC=ON \
+	-DALLOW_ARM64_CRC32=ON \
+	-DENABLE_SMALL=OFF \
+	-DENABLE_SANDBOX=ON \
+	-DCREATE_XZ_SYMLINKS=ON \
+	-DCREATE_LZMA_SYMLINKS=ON \
+	-DBUILD_SHARED_LIBS=OFF
 
 HOST_XZ_CONF_OPTS = \
 	$(XZ_CONF_OPTS) \
-	--enable-nls \
-	--enable-threads
+	-DENABLE_NLS=ON \
+	-DENABLE_THREADS=ON
 
 ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
-XZ_CONF_OPTS += --enable-nls
+XZ_CONF_OPTS += -DENABLE_NLS=ON
 else
-Z_CONF_OPTS += --disable-nls
+XZ_CONF_OPTS += -DENABLE_NLS=OFF
 endif
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-XZ_CONF_OPTS += --enable-threads
+XZ_CONF_OPTS += -DENABLE_THREADS=ON
 else
-XZ_CONF_OPTS += --disable-threads
+XZ_CONF_OPTS += -DENABLE_THREADS=OFF
 endif
 
 # we are built before ccache
@@ -63,5 +50,5 @@ HOST_XZ_CONF_ENV = \
 	CC="$(HOSTCC_NOCCACHE)" \
 	CXX="$(HOSTCXX_NOCCACHE)"
 
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 5/5] package/xz: convert to cmake build

[Arnout Vandecappelle via buildroot]

On 12/06/2024 15:57, Peter Seiderer via buildroot wrote:
> Convert to cmake build with the following autoconf options without
> direct equivalent cmake option:
> 
> - '--disable-external-sha256'
> 
> - '--enable-assembler'
> 
> - '--enable-assume-ram=128': hard coded in the CMakeLists.txt file
>    1732     target_compile_definitions(xz PRIVATE ASSUME_RAM=128)
> 
> - '--enable-scripts' (see [1]: 'CMake: xzdiff, xzgrep, xzless, xzmore, and
>    their symlinks are now installed')
> 
> - '--enable-symbol-versions': hard coded in the CMakeLists.txt file
>    1297     target_compile_definitions(liblzma PRIVATE HAVE_SYMBOL_VERSIONS_LINUX=1)
> 
> - '--enable-rpath'
> 
> - '--enable-largefile': see CMakeLists.txt
>    245 # Check for large file support. It's required on some 32-bit platforms and
>    246 # even on 64-bit MinGW-w64 to get 64-bit off_t. This can be forced off on
>    247 # the CMake command line if needed: -DLARGE_FILE_SUPPORT=OFF
>    248 tuklib_large_file_support(ALL)
> 
> - '--enable-unaligned-access=auto': see CMakeLists.txt and cmake/tuklib_integer.cmake
>     250 # This is needed by liblzma and xz.
>     251 tuklib_integer(ALL)
> 
> - '--disable-unsafe-type-punning' see CMakeLists.txt and cmake/tuklib_integer.cmake
>     250 # This is needed by liblzma and xz.
>     251 tuklib_integer(ALL)
> 
> - '--disable-werror'
> 
> - '--enable-year2038'

  I've extended these explanations to cover _all_ the configure options. Here is 
the full commit message:

     Use direct equivalents where available. The following autoconf options
     don't have a direct equivalent in CMakeLists.txt.

     - '--enable-checks=crc32': CRC32 is always enabled; the equivalent CMake
       option is therefore calles ADDITIONAL_CHECK_TYPES.

     - '--disable-external-sha256': external sha256 is not supported with
       CMake.

     - '--enable-assembler': No direct equivalent, though there is an option
       ENABLE_X86_ASM which must be enabled explicitly (no auto-detection).
       Since this only works on x86 and we're not sure if it works on all x86
       variants, leave it disabled.

     - '--enable-assume-ram=128': hard coded in the CMakeLists.txt file
       1732     target_compile_definitions(xz PRIVATE ASSUME_RAM=128)

     - '--enable-xz', '--enable-xzdec', '--enable-lzmadec',
       '--enable-lzmainfo', --enable-lzma-links': The decoder programs are
       always enabled if they're enabled in the library. The symlinks are
       controlled by two separate options: CREATE_XZ_SYMLINKS and
       CREATE_LZMA_SYMLINKS.

     - '--enable-scripts' (see [1]: 'CMake: xzdiff, xzgrep, xzless, xzmore, and
       their symlinks are now installed')

     - '--enable-symbol-versions': hard coded in the CMakeLists.txt file
       1297     target_compile_definitions(liblzma PRIVATE 
HAVE_SYMBOL_VERSIONS_LINUX=1)

     - '--enable-rpath': There is no CMake equivalent for this.

     - '--enable-largefile': see CMakeLists.txt
       245 # Check for large file support. It's required on some 32-bit 
platforms and
       246 # even on 64-bit MinGW-w64 to get 64-bit off_t. This can be forced off on
       247 # the CMake command line if needed: -DLARGE_FILE_SUPPORT=OFF
       248 tuklib_large_file_support(ALL)

     - '--enable-unaligned-access=auto': see CMakeLists.txt and 
cmake/tuklib_integer.cmake
        250 # This is needed by liblzma and xz.
        251 tuklib_integer(ALL)

     - '--disable-unsafe-type-punning' see CMakeLists.txt and 
cmake/tuklib_integer.cmake
        250 # This is needed by liblzma and xz.
        251 tuklib_integer(ALL)

     - '--disable-werror': There is no option to _enable_ -Werror in
       CMakeLists.txt.

     - '--enable-year2038': There is no option to enable Y2038 support in
       CMakeLists.txt, but we anyway do that globally.


> [1] https://github.com/tukaani-project/xz/releases/tag/v5.6.0
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Changes v1 -> v2:
>   - remove '-DUSE_ATTR_IFUNC=ON' (upstream removed)
>   - adjust CMakeLists.txt reference line numbers
> ---
>   package/xz/xz.mk | 57 +++++++++++++++++++-----------------------------
>   1 file changed, 22 insertions(+), 35 deletions(-)
> 
> diff --git a/package/xz/xz.mk b/package/xz/xz.mk
> index d81d0cf4ce..6f8a564887 100644
> --- a/package/xz/xz.mk
> +++ b/package/xz/xz.mk
> @@ -8,54 +8,41 @@ XZ_VERSION = 5.6.2
>   XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
>   XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)
>   XZ_INSTALL_STAGING = YES
> -XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
>   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 \
> -	--enable-year2038
> +	-DENCODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \
> +	-DDECODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \
> +	-DMATCH_FINDERS="hc3;hc4;bt2;bt3;bt4" \
> +	-DADDITIONAL_CHECK_TYPES="crc64;sha256" \
> +	-DMICROLZMA_ENCODER=ON \
> +	-DMICROLZMA_DECODER=ON \
> +	-DLZIP_DECODER=ON \
> +	-DALLOW_CLMUL_CRC=ON \
> +	-DALLOW_ARM64_CRC32=ON \
> +	-DENABLE_SMALL=OFF \
> +	-DENABLE_SANDBOX=ON \
> +	-DCREATE_XZ_SYMLINKS=ON \
> +	-DCREATE_LZMA_SYMLINKS=ON \
> +	-DBUILD_SHARED_LIBS=OFF
>   
>   HOST_XZ_CONF_OPTS = \
>   	$(XZ_CONF_OPTS) \
> -	--enable-nls \
> -	--enable-threads
> +	-DENABLE_NLS=ON \
> +	-DENABLE_THREADS=ON
>   
>   ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
> -XZ_CONF_OPTS += --enable-nls
> +XZ_CONF_OPTS += -DENABLE_NLS=ON
>   else
> -Z_CONF_OPTS += --disable-nls
> +XZ_CONF_OPTS += -DENABLE_NLS=OFF
>   endif
>   
>   ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
> -XZ_CONF_OPTS += --enable-threads
> +XZ_CONF_OPTS += -DENABLE_THREADS=ON
>   else
> -XZ_CONF_OPTS += --disable-threads
> +XZ_CONF_OPTS += -DENABLE_THREADS=OFF
>   endif
>   
>   # we are built before ccache
> @@ -63,5 +50,5 @@ HOST_XZ_CONF_ENV = \
>   	CC="$(HOSTCC_NOCCACHE)" \
>   	CXX="$(HOSTCXX_NOCCACHE)"

  This part no longer works with CMake. Instead, it should be done by overriding 
CMAKE_C_COMPILER_LAUNCHER. I did that and added the following to the commit message:

     host-xz is itself a dependency of host-ccache, so we can't use ccache
     for building host-xz. For autotools, this was handled by setting CC and
     CXX in the environment for the configure script. This doesn't work for
     CMake, however. Instead, we must override the CMAKE_C_COMPILER_LAUNCHER
     option. Xz doesn't use C++, but for completeness also override
     CMAKE_CXX_COMPILER_LAUNCHER.



  Applied to master, thanks.

  Regards,
  Arnout

>   
> -$(eval $(autotools-package))
> -$(eval $(host-autotools-package))
> +$(eval $(cmake-package))
> +$(eval $(host-cmake-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 5/5] package/xz: convert to cmake build

[yann.morin]

Peter, All,

On 2024-06-12 15:57 +0200, Peter Seiderer via buildroot spake thusly:
> Convert to cmake build with the following autoconf options without
> direct equivalent cmake option:

This change broke the build of host-xz:

    $ ./utils/docker-run
    (docker) $ make defconfig
    (docker) $ make host-xz
    -- The C compiler identification is GNU 10.2.1
    -- Detecting C compiler ABI info
    -- Detecting C compiler ABI info - done
    -- Check for working C compiler: /usr/bin/gcc - skipped
    -- Detecting C compile features
    -- Detecting C compile features - done
    -- Performing Test TUKLIB_LARGE_FILE_SUPPORT_BY_DEFAULT
    -- Performing Test TUKLIB_LARGE_FILE_SUPPORT_BY_DEFAULT - Success
    -- Check if the system is big endian
    -- Searching 16 bit integer
    -- Looking for sys/types.h
    -- Looking for sys/types.h - found
    -- Looking for stdint.h
    -- Looking for stdint.h - found
    -- Looking for stddef.h
    -- Looking for stddef.h - found
    -- Check size of unsigned short
    -- Check size of unsigned short - done
    -- Searching 16 bit integer - Using unsigned short
    -- Check if the system is big endian - little endian
    -- Performing Test HAVE___BUILTIN_BSWAPXX
    -- Performing Test HAVE___BUILTIN_BSWAPXX - Success
    -- Performing Test HAVE___BUILTIN_ASSUME_ALIGNED
    -- Performing Test HAVE___BUILTIN_ASSUME_ALIGNED - Success
    -- Looking for clock_gettime
    -- Looking for clock_gettime - found
    -- Looking for CLOCK_MONOTONIC
    -- Looking for CLOCK_MONOTONIC - found
    -- Performing Test IS_LINUX_WITH_GLIBC
    -- Performing Test IS_LINUX_WITH_GLIBC - Success
    -- Looking for pthread.h
    -- Looking for pthread.h - found
    -- Performing Test CMAKE_HAVE_LIBC_PTHREAD
    -- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed
    -- Check if compiler accepts -pthread
    -- Check if compiler accepts -pthread - yes
    -- Found Threads: TRUE
    -- Looking for pthread_condattr_setclock
    -- Looking for pthread_condattr_setclock - found
    -- Looking for cap_rights_limit
    -- Looking for cap_rights_limit - not found
    -- Looking for pledge
    -- Looking for pledge - not found
    -- Performing Test HAVE_LINUX_LANDLOCK
    -- Performing Test HAVE_LINUX_LANDLOCK - Failed
    -- Checking how to detect the number of available CPU cores
    -- Performing Test TUKLIB_CPUCORES_SCHED_GETAFFINITY
    -- Performing Test TUKLIB_CPUCORES_SCHED_GETAFFINITY - Success
    -- Checking how to detect the amount of physical memory
    -- Performing Test TUKLIB_PHYSMEM_SPECIAL
    -- Performing Test TUKLIB_PHYSMEM_SPECIAL - Failed
    -- Performing Test TUKLIB_PHYSMEM_AIX
    -- Performing Test TUKLIB_PHYSMEM_AIX - Failed
    -- Performing Test TUKLIB_PHYSMEM_SYSCONF
    -- Performing Test TUKLIB_PHYSMEM_SYSCONF - Success
    -- Performing Test HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR
    -- Performing Test HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR - Success
    -- Looking for cpuid.h
    -- Looking for cpuid.h - found
    -- Looking for immintrin.h
    -- Looking for immintrin.h - found
    -- Performing Test HAVE__MM_MOVEMASK_EPI8
    -- Performing Test HAVE__MM_MOVEMASK_EPI8 - Success
    -- Performing Test HAVE_USABLE_CLMUL
    -- Performing Test HAVE_USABLE_CLMUL - Success
    -- Performing Test HAVE_ARM64_CRC32
    -- Performing Test HAVE_ARM64_CRC32 - Failed
    -- Looking for getopt_long
    -- Looking for getopt_long - found
    -- Looking for program_invocation_name
    -- Looking for program_invocation_name - found
    -- Looking for mbrtowc
    -- Looking for mbrtowc - found
    -- Looking for wcwidth
    -- Looking for wcwidth - found
    -- Looking for optreset
    -- Looking for optreset - not found
    -- Looking for posix_fadvise
    -- Looking for posix_fadvise - found
    -- Performing Test HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
    -- Performing Test HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC - Success
    -- Looking for futimens
    -- Looking for futimens - found
    -- Configuring done
    CMake Error at CMakeLists.txt:1675 (add_executable):
      Target "xz" links to target "Intl::Intl" but the target was not found.
      Perhaps a find_package() call is missing for an IMPORTED target, or an
      ALIAS target is missing?


    CMake Error at CMakeLists.txt:1619 (add_executable):
      Target "lzmainfo" links to target "Intl::Intl" but the target was not
      found.  Perhaps a find_package() call is missing for an IMPORTED target, or
      an ALIAS target is missing?


    -- Generating done
    CMake Warning:
      Manually-specified variables were not used by the project:

        BUILD_DOC
        BUILD_DOCS
        BUILD_EXAMPLE
        BUILD_EXAMPLES
        BUILD_TEST
        BUILD_TESTS
        CMAKE_ASM_COMPILER
        CMAKE_CXX_COMPILER
        CMAKE_CXX_FLAGS
        CMAKE_FIND_ROOT_PATH_MODE_LIBRARY


    CMake Generate step failed.  Build files cannot be regenerated correctly.

Could you have a look, please?

Regards,
Yann E. MORIN.

-- 
                                        ____________
.-----------------.--------------------:       _    :------------------.
|  Yann E. MORIN  | Real-Time Embedded |    __/ )   | /"\ ASCII RIBBON |
|                 | Software  Designer |  _/ - /'   | \ / CAMPAIGN     |
| +33 638.411.245 '--------------------: (_    `--, |  X  AGAINST      |
| yann.morin (at) orange.com           |_="    ,--' | / \ HTML MAIL    |
'--------------------------------------:______/_____:------------------'

____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 5/5] package/xz: convert to cmake build

[yann.morin]

Peter, All,

On 2024-06-25 11:56 +0200, MORIN Yann INNOV/IT-S spake thusly:
> On 2024-06-12 15:57 +0200, Peter Seiderer via buildroot spake thusly:
> > Convert to cmake build with the following autoconf options without
> > direct equivalent cmake option:

The autotools build system is still operational, and still works. So,
what was the rationale behind that change?

Was that a defence against another backdooring attempt? If so, I think
it should have been stated clearly in the commit log. Also, we can be as
paranoid as we want, but it is possible to inject a similar backdoor
in cmake as was injected in autotools, so switching to cmake just for
this reason is not rally sufficient...

Note: the issue I hit can be solved by passing ENABLE_NLS=OFF in the
host variant; we don't really require translations, so we can
unconditionally turn it off.

However, we might hit a similar issue in target builds, and there, I am
not sure what would be the best solution...

Regards,
Yann E. MORIN.

-- 
                                        ____________
.-----------------.--------------------:       _    :------------------.
|  Yann E. MORIN  | Real-Time Embedded |    __/ )   | /"\ ASCII RIBBON |
|                 | Software  Designer |  _/ - /'   | \ / CAMPAIGN     |
| +33 638.411.245 '--------------------: (_    `--, |  X  AGAINST      |
| yann.morin (at) orange.com           |_="    ,--' | / \ HTML MAIL    |
'--------------------------------------:______/_____:------------------'

____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 5/5] package/xz: convert to cmake build

[Peter Seiderer via buildroot]

Hello Yann,

On Tue, 25 Jun 2024 13:11:12 +0200, yann.morin@orange.com wrote:

> Peter, All,
>
> On 2024-06-25 11:56 +0200, MORIN Yann INNOV/IT-S spake thusly:
> > On 2024-06-12 15:57 +0200, Peter Seiderer via buildroot spake thusly:
> > > Convert to cmake build with the following autoconf options without
> > > direct equivalent cmake option:
>
> The autotools build system is still operational, and still works. So,
> what was the rationale behind that change?
>
> Was that a defence against another backdooring attempt? If so, I think
> it should have been stated clearly in the commit log. Also, we can be as
> paranoid as we want, but it is possible to inject a similar backdoor
> in cmake as was injected in autotools, so switching to cmake just for
> this reason is not rally sufficient...

No, as the first suggestion ([1], marked as RFC - missed the RFC marking in
patch set version v2) predates the backdoor detection (but migrating away from
autoconf/automake was discusses as one measure for backdoor avoidance),
my motivation was the following passage from the NEWS file ([2]):

        - The CMake-based build is now close to feature parity with the
          Autotools-based build. Most importantly a few tests aren't
          run yet. Testing the CMake-based build on different operating
          systems would be welcome now. See the comment at the top of
          CMakeLists.txt.

And the amount of work done for the cmake build system seems to hint
that xz is moving away from autoconf/automake towards the cmake system...

>
> Note: the issue I hit can be solved by passing ENABLE_NLS=OFF in the
> host variant; we don't really require translations, so we can
> unconditionally turn it off.

Seems my intermediate step from 'package/xz: determine all autoconf options'
and '--enable-nls' unconditionally for the host variant was wrong...,
care to send a patch (as you can reproduce the failure)?

>
> However, we might hit a similar issue in target builds, and there, I am
> not sure what would be the best solution...

Already handled(?) in package/xz/xz.mk:

ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
XZ_CONF_OPTS += -DENABLE_NLS=ON
else
XZ_CONF_OPTS += -DENABLE_NLS=OFF
endif

Regards,
Peter

[1] https://lore.kernel.org/all/20240307165218.10027-4-ps.report@gmx.net/
[2] https://github.com/tukaani-project/xz/blob/master/NEWS

>
> Regards,
> Yann E. MORIN.
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 5/5] package/xz: convert to cmake build

[Yann E. MORIN]

Peter, All,

(To avoid confusion: Yann@home speaking here)

On 2024-06-26 10:36 +0200, Peter Seiderer via buildroot spake thusly:
> On Tue, 25 Jun 2024 13:11:12 +0200, yann.morin@orange.com wrote:
> > On 2024-06-25 11:56 +0200, MORIN Yann INNOV/IT-S spake thusly:
> > > On 2024-06-12 15:57 +0200, Peter Seiderer via buildroot spake thusly:
> > > > Convert to cmake build with the following autoconf options without
> > > > direct equivalent cmake option:
> >
> > The autotools build system is still operational, and still works. So,
> > what was the rationale behind that change?
> >
> > Was that a defence against another backdooring attempt? If so, I think
> > it should have been stated clearly in the commit log. Also, we can be as
> > paranoid as we want, but it is possible to inject a similar backdoor
> > in cmake as was injected in autotools, so switching to cmake just for
> > this reason is not rally sufficient...
> 
> No, as the first suggestion ([1], marked as RFC - missed the RFC marking in
> patch set version v2) predates the backdoor detection (but migrating away from
> autoconf/automake was discusses as one measure for backdoor avoidance),
> my motivation was the following passage from the NEWS file ([2]):
> 
>         - The CMake-based build is now close to feature parity with the
>           Autotools-based build. Most importantly a few tests aren't
>           run yet. Testing the CMake-based build on different operating
>           systems would be welcome now. See the comment at the top of
>           CMakeLists.txt.
> 
> And the amount of work done for the cmake build system seems to hint
> that xz is moving away from autoconf/automake towards the cmake system...

Note that there is also some effort toward a meson-based buildsystem:
    https://github.com/tukaani-project/xz/pull/120

> > Note: the issue I hit can be solved by passing ENABLE_NLS=OFF in the
> > host variant; we don't really require translations, so we can
> > unconditionally turn it off.
> 
> Seems my intermediate step from 'package/xz: determine all autoconf options'
> and '--enable-nls' unconditionally for the host variant was wrong...,

Also, forcibly setting BUILD_SHARED_LIBS=OFF for the target is probably
wrong. And using the target options for the host is equivalently very
wrong.

> care to send a patch (as you can reproduce the failure)?

Yann@work provided a very sinple way to reproduce the issue:

    $ ./utils/docker-run
    (docker) $ make defconfig
    (docker) $ make host-xz

So you could at least try that to reproduce on your side.

He also provided a suggestion to turn NLS=OFF, but that was suposedly
not needed in your case, so there is something to investigate.

When maintainers apply patches, they accept that it may break something
down the line, so it is not a problem that a patch had issues; they
guess the contributor tested as best as they could, and the
reviewer-committer do their best as well, so it was good to be applied.

However, when maintainers apply patches, they also expect contributors
to own their changes, and that they are pro-active in trying to fix
their change that caused the breakage, without swinging the effort to
someone else without at least trying to reproduce and investigate on
their side. After all, the contributor is in the best position to
investigate: they know the purpose of the change, and they have the
knowledge of the tests they did, so they know where to look at.

If maintainers can't rely on that expectation, then they can get very
chilly about applying patches as they know any breakage might not be
acted upon, and that the burden of fixing it will pile upon them to
increase the existing load...

Again, it is not a problem that the patch broke something; without
trying, we can know. There is absolutely no blame on you at all for that
patch! We are very happy for your contributions! :-)

Still, this carelessness in handling a breakage is a bit disapointing...

Anyway, I have now reverted that patch, as it was exposing another issue
with host-python3 (https://gitlab.com/buildroot.org/buildroot/-/issues/5)

When the cmake buildsystem is official, then do not hesitate to resubmit
an improved patch, based on the commit that was initially applied. If
you hit a road-block, do not hesitate to ask for further help, of
course!

Thank you!

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 5/5] package/xz: convert to cmake build

[Peter Seiderer via buildroot]

Hello Yann,

On Wed, 26 Jun 2024 21:32:20 +0200, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Peter, All,
> 
> (To avoid confusion: Yann@home speaking here)
> 
> On 2024-06-26 10:36 +0200, Peter Seiderer via buildroot spake thusly:
> > On Tue, 25 Jun 2024 13:11:12 +0200, yann.morin@orange.com wrote:  
> > > On 2024-06-25 11:56 +0200, MORIN Yann INNOV/IT-S spake thusly:  
> > > > On 2024-06-12 15:57 +0200, Peter Seiderer via buildroot spake thusly:  
> > > > > Convert to cmake build with the following autoconf options without
> > > > > direct equivalent cmake option:  
> > >
> > > The autotools build system is still operational, and still works. So,
> > > what was the rationale behind that change?
> > >
> > > Was that a defence against another backdooring attempt? If so, I think
> > > it should have been stated clearly in the commit log. Also, we can be as
> > > paranoid as we want, but it is possible to inject a similar backdoor
> > > in cmake as was injected in autotools, so switching to cmake just for
> > > this reason is not rally sufficient...  
> > 
> > No, as the first suggestion ([1], marked as RFC - missed the RFC marking in
> > patch set version v2) predates the backdoor detection (but migrating away from
> > autoconf/automake was discusses as one measure for backdoor avoidance),
> > my motivation was the following passage from the NEWS file ([2]):
> > 
> >         - The CMake-based build is now close to feature parity with the
> >           Autotools-based build. Most importantly a few tests aren't
> >           run yet. Testing the CMake-based build on different operating
> >           systems would be welcome now. See the comment at the top of
> >           CMakeLists.txt.
> > 
> > And the amount of work done for the cmake build system seems to hint
> > that xz is moving away from autoconf/automake towards the cmake system...  
> 
> Note that there is also some effort toward a meson-based buildsystem:
>     https://github.com/tukaani-project/xz/pull/120
> 
> > > Note: the issue I hit can be solved by passing ENABLE_NLS=OFF in the
> > > host variant; we don't really require translations, so we can
> > > unconditionally turn it off.  
> > 
> > Seems my intermediate step from 'package/xz: determine all autoconf options'
> > and '--enable-nls' unconditionally for the host variant was wrong...,  
> 
> Also, forcibly setting BUILD_SHARED_LIBS=OFF for the target is probably
> wrong. And using the target options for the host is equivalently very
> wrong.
> 
> > care to send a patch (as you can reproduce the failure)?  
> 
> Yann@work provided a very sinple way to reproduce the issue:
> 
>     $ ./utils/docker-run
>     (docker) $ make defconfig
>     (docker) $ make host-xz

Ups, seems I was to quick reading your first e-mail (and skipped
this lines)...

> 
> So you could at least try that to reproduce on your side.

Fails on my side (using podman intead of docker):

	>>> host-pkgconf 1.6.3 Downloading
	mkdir: cannot create directory ‘/pkgconf’: Permission denied

> 
> He also provided a suggestion to turn NLS=OFF, but that was suposedly
> not needed in your case, so there is something to investigate.
> 
> When maintainers apply patches, they accept that it may break something
> down the line, so it is not a problem that a patch had issues; they
> guess the contributor tested as best as they could, and the
> reviewer-committer do their best as well, so it was good to be applied.
> 
> However, when maintainers apply patches, they also expect contributors
> to own their changes, and that they are pro-active in trying to fix
> their change that caused the breakage, without swinging the effort to
> someone else without at least trying to reproduce and investigate on
> their side. After all, the contributor is in the best position to
> investigate: they know the purpose of the change, and they have the
> knowledge of the tests they did, so they know where to look at.
> 
> If maintainers can't rely on that expectation, then they can get very
> chilly about applying patches as they know any breakage might not be
> acted upon, and that the burden of fixing it will pile upon them to
> increase the existing load...
> 
> Again, it is not a problem that the patch broke something; without
> trying, we can know. There is absolutely no blame on you at all for that
> patch! We are very happy for your contributions! :-)
> 
> Still, this carelessness in handling a breakage is a bit disapointing...
> 
> Anyway, I have now reverted that patch, as it was exposing another issue
> with host-python3 (https://gitlab.com/buildroot.org/buildroot/-/issues/5)

Yes, reverting the patch seems to be the best solution for the moment...

Maybe although reverting 'package/xz: explicitly specify all autoconf options'
(and 'package/xz: enable year2038 option') as I used the same
'HOST_XZ_CONF_OPTS = $(XZ_CONF_OPTS)...' pattern here?

Regards,
Peter

> 
> When the cmake buildsystem is official, then do not hesitate to resubmit
> an improved patch, based on the commit that was initially applied. If
> you hit a road-block, do not hesitate to ask for further help, of
> course!
> 
> Thank you!
> 
> Regards,
> Yann E. MORIN.
> 

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 5/5] package/xz: convert to cmake build

[Peter Seiderer via buildroot]

On Thu, 27 Jun 2024 09:50:29 +0200, Peter Seiderer <ps.report@gmx.net> wrote:

[...]
> Fails on my side (using podman intead of docker):
> 
> 	>>> host-pkgconf 1.6.3 Downloading  
> 	mkdir: cannot create directory ‘/pkgconf’: Permission denied
> 

Problem fixed, my local 'dl' directory was link to some outside location,
with this link removed the command works and I can reproduce the
problem...

Regards,
Peter
 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 5/5] package/xz: convert to cmake build

[Peter Seiderer via buildroot]

On Thu, 27 Jun 2024 09:50:29 +0200, Peter Seiderer <ps.report@gmx.net> wrote:

[...]

> >
> > Anyway, I have now reverted that patch, as it was exposing another issue
> > with host-python3 (https://gitlab.com/buildroot.org/buildroot/-/issues/5)
>
> Yes, reverting the patch seems to be the best solution for the moment...

The following quick patch solves the host-xz and host-python3 build failures
for me:

diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index b22b96849d..b22ccac85f 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -12,7 +12,7 @@ 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 = \
+XZ_COMMON_CONF_OPTS = \
 	-DENCODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \
 	-DDECODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \
 	-DMATCH_FINDERS="hc3;hc4;bt2;bt3;bt4" \
@@ -25,8 +25,9 @@ XZ_CONF_OPTS = \
 	-DENABLE_SMALL=OFF \
 	-DENABLE_SANDBOX=ON \
 	-DCREATE_XZ_SYMLINKS=ON \
-	-DCREATE_LZMA_SYMLINKS=ON \
-	-DBUILD_SHARED_LIBS=OFF
+	-DCREATE_LZMA_SYMLINKS=ON
+
+XZ_CONF_OPTS = $(XZ_COMMON_CONF_OPTS)

 ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
 XZ_CONF_OPTS += -DENABLE_NLS=ON
@@ -42,11 +43,11 @@ endif

 # we are built before ccache
 HOST_XZ_CONF_OPTS = \
-	$(XZ_CONF_OPTS) \
-	-DENABLE_NLS=ON \
+	$(XZ_COMMON_CONF_OPTS) \
+	-DENABLE_NLS=OFF \
 	-DENABLE_THREADS=ON \
 	-DCMAKE_C_COMPILER_LAUNCHER="" \
-	-DCMAKE_CXX_COMPILER_LAUNCHER==""
+	-DCMAKE_CXX_COMPILER_LAUNCHER=""

 $(eval $(cmake-package))
 $(eval $(host-cmake-package))

Regards,
Peter


>
> Maybe although reverting 'package/xz: explicitly specify all autoconf options'
> (and 'package/xz: enable year2038 option') as I used the same
> 'HOST_XZ_CONF_OPTS = $(XZ_CONF_OPTS)...' pattern here?
>
> Regards,
> Peter
>

[...]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 5/5] package/xz: convert to cmake build

[yann.morin]

Peter, All,

On 2024-06-27 10:26 +0200, Peter Seiderer spake thusly:
> On Thu, 27 Jun 2024 09:50:29 +0200, Peter Seiderer <ps.report@gmx.net> wrote:
> > > Anyway, I have now reverted that patch, as it was exposing another issue
> > > with host-python3 (https://gitlab.com/buildroot.org/buildroot/-/issues/5)
[--SNIP--]
> The following quick patch solves the host-xz and host-python3 build failures
> for me:
> 
> diff --git a/package/xz/xz.mk b/package/xz/xz.mk
> index b22b96849d..b22ccac85f 100644
> --- a/package/xz/xz.mk
> +++ b/package/xz/xz.mk
> @@ -12,7 +12,7 @@ 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 = \
> +XZ_COMMON_CONF_OPTS = \

I think _COMMON_CONF_OPTS is to be avoided: it is easy to add/remove
options from that list, that affects both builds, but we don't want to
do that most of the time.

Looking at a few other packages, we leave the host options to a bare
minimum, while there are more options specified for the target.

In this case, I see that he en/decoder list is indeed probably sharable,
but I think I'd put it in a variable of its own:

    XZ_CODERS = lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv
    XZ_CONF_OPTS = \
        -DENCODERS="$(XZ_CODERS)" \
        -DDECODERS="$(XZ_CODERS)" \
        ...

    HOST_XZ_CONF_OPTS = \
        -DENCODERS="$(XZ_CODERS)" \
        -DDECODERS="$(XZ_CODERS)" \
        ...

But do we _have_ to pass that list at all? Can't we jsut tell xz to
enable all of them? How can we detect that a coder is no longer valid
and should be removed?

If I look at the repository

    https://github.com/tukaani-project/xz/blob/v5.6.2/CMakeLists.txt#L693

    set(ENCODERS "${SUPPORTED_FILTERS}" CACHE STRING "Encoders to support")

So it would seem the default is to enable everything, and we should just
drop the option, no?

>  	-DENCODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \
>  	-DDECODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \
>  	-DMATCH_FINDERS="hc3;hc4;bt2;bt3;bt4" \
> @@ -25,8 +25,9 @@ XZ_CONF_OPTS = \
>  	-DENABLE_SMALL=OFF \
>  	-DENABLE_SANDBOX=ON \
>  	-DCREATE_XZ_SYMLINKS=ON \
> -	-DCREATE_LZMA_SYMLINKS=ON \
> -	-DBUILD_SHARED_LIBS=OFF
> +	-DCREATE_LZMA_SYMLINKS=ON
> +
> +XZ_CONF_OPTS = $(XZ_COMMON_CONF_OPTS)
> 
>  ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
>  XZ_CONF_OPTS += -DENABLE_NLS=ON
> @@ -42,11 +43,11 @@ endif
> 
>  # we are built before ccache
>  HOST_XZ_CONF_OPTS = \
> -	$(XZ_CONF_OPTS) \
> -	-DENABLE_NLS=ON \
> +	$(XZ_COMMON_CONF_OPTS) \
> +	-DENABLE_NLS=OFF \

But the real question is: why does it sometines work, and sometimes not?
This needs to be expained and traced in the commit log.

On my F39, and on Arnout's F40, as well as on your system, it was
working. What changed in the reference build environment that causes the
build to fial? On IRC, Arnout had a suggestion: "I guess you have
libintl-dev or something installed there?"

In any case, I believe such a conversion can only be done once upstream
conisders the cmake buildsystem complete and official, which it
currently does not.

Thank you for testing on your side as well! 👍

In the meantime, I had started a test in the background, buildig those
configurations:

  - glibc, no NLS
  - glibc, NLS
  - musl, no NLS
  - musl, NLS
  - uClibc-NG, no NLS
  - uClibc-NG, NLS

All 6 combinations yield a configuration where xz (the target variant)
builds successfully. So it seems NLS=ON/OFF works OK for the target.

Regards,
Yann E. MORIN.

>  	-DENABLE_THREADS=ON \
>  	-DCMAKE_C_COMPILER_LAUNCHER="" \
> -	-DCMAKE_CXX_COMPILER_LAUNCHER==""
> +	-DCMAKE_CXX_COMPILER_LAUNCHER=""
> 
>  $(eval $(cmake-package))
>  $(eval $(host-cmake-package))
> 
> Regards,
> Peter
> 
> 
> >
> > Maybe although reverting 'package/xz: explicitly specify all autoconf options'
> > (and 'package/xz: enable year2038 option') as I used the same
> > 'HOST_XZ_CONF_OPTS = $(XZ_CONF_OPTS)...' pattern here?
> >
> > Regards,
> > Peter
> >
> 
> [...]
> 

-- 
                                        ____________
.-----------------.--------------------:       _    :------------------.
|  Yann E. MORIN  | Real-Time Embedded |    __/ )   | /"\ ASCII RIBBON |
|                 | Software  Designer |  _/ - /'   | \ / CAMPAIGN     |
| +33 638.411.245 '--------------------: (_    `--, |  X  AGAINST      |
| yann.morin (at) orange.com           |_="    ,--' | / \ HTML MAIL    |
'--------------------------------------:______/_____:------------------'

____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 5/5] package/xz: convert to cmake build

[Peter Seiderer via buildroot]

Hello Yann, *,

On Thu, 27 Jun 2024 13:16:20 +0200, yann.morin@orange.com wrote:

> Peter, All,
> 
> On 2024-06-27 10:26 +0200, Peter Seiderer spake thusly:
> > On Thu, 27 Jun 2024 09:50:29 +0200, Peter Seiderer <ps.report@gmx.net> wrote:  
> > > > Anyway, I have now reverted that patch, as it was exposing another issue
> > > > with host-python3 (https://gitlab.com/buildroot.org/buildroot/-/issues/5)  
> [--SNIP--]
> > The following quick patch solves the host-xz and host-python3 build failures
> > for me:
> > 
> > diff --git a/package/xz/xz.mk b/package/xz/xz.mk
> > index b22b96849d..b22ccac85f 100644
> > --- a/package/xz/xz.mk
> > +++ b/package/xz/xz.mk
> > @@ -12,7 +12,7 @@ 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 = \
> > +XZ_COMMON_CONF_OPTS = \  
> 
> I think _COMMON_CONF_OPTS is to be avoided: it is easy to add/remove
> options from that list, that affects both builds, but we don't want to
> do that most of the time.
> 
> Looking at a few other packages, we leave the host options to a bare
> minimum, while there are more options specified for the target.
> 
> In this case, I see that he en/decoder list is indeed probably sharable,
> but I think I'd put it in a variable of its own:
> 
>     XZ_CODERS = lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv
>     XZ_CONF_OPTS = \
>         -DENCODERS="$(XZ_CODERS)" \
>         -DDECODERS="$(XZ_CODERS)" \
>         ...
> 
>     HOST_XZ_CONF_OPTS = \
>         -DENCODERS="$(XZ_CODERS)" \
>         -DDECODERS="$(XZ_CODERS)" \
>         ...
> 
> But do we _have_ to pass that list at all? Can't we jsut tell xz to
> enable all of them? How can we detect that a coder is no longer valid
> and should be removed?
> 
> If I look at the repository
> 
>     https://github.com/tukaani-project/xz/blob/v5.6.2/CMakeLists.txt#L693
> 
>     set(ENCODERS "${SUPPORTED_FILTERS}" CACHE STRING "Encoders to support")
> 
> So it would seem the default is to enable everything, and we should just
> drop the option, no?
> 
> >  	-DENCODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \
> >  	-DDECODERS="lzma1;lzma2;delta;x86;powerpc;ia64;arm;armthumb;arm64;sparc;riscv" \
> >  	-DMATCH_FINDERS="hc3;hc4;bt2;bt3;bt4" \
> > @@ -25,8 +25,9 @@ XZ_CONF_OPTS = \
> >  	-DENABLE_SMALL=OFF \
> >  	-DENABLE_SANDBOX=ON \
> >  	-DCREATE_XZ_SYMLINKS=ON \
> > -	-DCREATE_LZMA_SYMLINKS=ON \
> > -	-DBUILD_SHARED_LIBS=OFF
> > +	-DCREATE_LZMA_SYMLINKS=ON
> > +
> > +XZ_CONF_OPTS = $(XZ_COMMON_CONF_OPTS)
> > 
> >  ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
> >  XZ_CONF_OPTS += -DENABLE_NLS=ON
> > @@ -42,11 +43,11 @@ endif
> > 
> >  # we are built before ccache
> >  HOST_XZ_CONF_OPTS = \
> > -	$(XZ_CONF_OPTS) \
> > -	-DENABLE_NLS=ON \
> > +	$(XZ_COMMON_CONF_OPTS) \
> > +	-DENABLE_NLS=OFF \  
> 
> But the real question is: why does it sometines work, and sometimes not?
> This needs to be expained and traced in the commit log.

I believe it is the combination of '-DENABLE_NLS=ON' and the legacy cmake
version in the container (3.18.4), see CMakeLists.txt:

 290 if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20")
 291     find_package(Intl)
 292     find_package(Gettext)
 293 
 294     if(Intl_FOUND)
 295         option(ENABLE_NLS "Native Language Support (translated messages)" ON)
[...]
 304         if(ENABLE_NLS AND NOT GETTEXT_FOUND AND
 305                 NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/uk.gmo")
 306             # This only sets the variable, not the cache variable!
 307             set(ENABLE_NLS OFF)
[...]
 332     endif()
 333 endif()

Issue (and suggested fix) reported upstream:

	https://github.com/tukaani-project/xz/issues/129
	https://github.com/tukaani-project/xz/pull/130

> 
> On my F39, and on Arnout's F40, as well as on your system, it was
> working. What changed in the reference build environment that causes the
> build to fial? On IRC, Arnout had a suggestion: "I guess you have
> libintl-dev or something installed there?"
> 
> In any case, I believe such a conversion can only be done once upstream
> conisders the cmake buildsystem complete and official, which it
> currently does not.

Changed recently, see 'CMake: Not experimental anymore'
(https://github.com/tukaani-project/xz/commit/5279828635a95abdef82e691fc4979d362780e63)

> 
> Thank you for testing on your side as well! 👍
> 
> In the meantime, I had started a test in the background, buildig those
> configurations:
> 
>   - glibc, no NLS
>   - glibc, NLS
>   - musl, no NLS
>   - musl, NLS
>   - uClibc-NG, no NLS
>   - uClibc-NG, NLS
> 
> All 6 combinations yield a configuration where xz (the target variant)
> builds successfully. So it seems NLS=ON/OFF works OK for the target.

Did you test on a local system or container (which cmake version(s))?

Regards,
Peter

> 
> Regards,
> Yann E. MORIN.
> 
> >  	-DENABLE_THREADS=ON \
> >  	-DCMAKE_C_COMPILER_LAUNCHER="" \
> > -	-DCMAKE_CXX_COMPILER_LAUNCHER==""
> > +	-DCMAKE_CXX_COMPILER_LAUNCHER=""
> > 
> >  $(eval $(cmake-package))
> >  $(eval $(host-cmake-package))
> > 
> > Regards,
> > Peter
> > 
> >   
> > >
> > > Maybe although reverting 'package/xz: explicitly specify all autoconf options'
> > > (and 'package/xz: enable year2038 option') as I used the same
> > > 'HOST_XZ_CONF_OPTS = $(XZ_CONF_OPTS)...' pattern here?
> > >
> > > Regards,
> > > Peter
> > >  
> > 
> > [...]
> >   
> 

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/5] package/xz: bump version to 5.4.7

[Arnout Vandecappelle via buildroot]

On 12/06/2024 15:57, Peter Seiderer via buildroot wrote:
> - add key hint for download signature check
> - update COPYING hash due to [1] (change of home page URL)
> 
> For details see [2].

  I've added a statement here to make clear this is not affected by the backdoor.

  Peter, this is for 2024.02.x and 2024.05.x.


> [1] https://github.com/tukaani-project/xz/commit/c5c091332c6953a0ce940cb355ea9e99491429fc
> 
> [2] https://github.com/tukaani-project/xz/releases/tag/v5.4.7
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
> Changelog v1 -> v2:
>    - new patch, bump old stable version
> ---
>   package/xz/xz.hash | 8 +++++---
>   package/xz/xz.mk   | 2 +-
>   2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/package/xz/xz.hash b/package/xz/xz.hash
> index e8025a8065..ff070f6775 100644
> --- a/package/xz/xz.hash
> +++ b/package/xz/xz.hash
> @@ -1,9 +1,11 @@
>   # Locally calculated after checking pgp signature
> -# https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.bz2.sig
> -sha256  913851b274e8e1d31781ec949f1c23e8dbcf0ecf6e73a2436dc21769dd3e6f49  xz-5.4.6.tar.bz2
> +# https://github.com/tukaani-project/xz/releases/download/v5.4.7/xz-5.4.7.tar.bz2.sig
> +# using key 3690C240CE51B4670D30AD1C38EE757D69184620 Lasse Collin <lasse.collin@tukaani.org>
> +
> +sha256  9976ed9cd0764e962d852d7d519ee1c3a7f87aca3b86e5d021a45650ba3ecb41  xz-5.4.7.tar.bz2
>   
>   # Hash for license files
> -sha256  29a1e305b2e34eefe5d4602d00cde1d528b71c5d9f2eec5106972cf6ddb6f73f  COPYING
> +sha256  72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e  COPYING
>   sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING.GPLv2
>   sha256  3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  COPYING.GPLv3
>   sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPLv2.1
> diff --git a/package/xz/xz.mk b/package/xz/xz.mk
> index 40fa59ca7c..d5dceb0eae 100644
> --- a/package/xz/xz.mk
> +++ b/package/xz/xz.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -XZ_VERSION = 5.4.6
> +XZ_VERSION = 5.4.7
>   XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
>   XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)
>   XZ_INSTALL_STAGING = YES
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/5] package/xz: bump version to 5.4.7

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 > On 12/06/2024 15:57, Peter Seiderer via buildroot wrote:
 >> - add key hint for download signature check
 >> - update COPYING hash due to [1] (change of home page URL)
 >> For details see [2].

 >  I've added a statement here to make clear this is not affected by the backdoor.

 >  Peter, this is for 2024.02.x and 2024.05.x.

OK. Looking at https://github.com/tukaani-project/xz/releases/tag/v5.4.7
I see a mention about a shared library regression on mips64, but I am
not sure where the mentioned patch can be found?

The 5.4.7 bugfixes do not look very critical, so we could alternatively
also just not bump the version on 2024.02.x / 2024.05.x.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/5] package/xz: bump version to 5.4.7

[Peter Seiderer via buildroot]

Hello Peter, *,

On Mon, 08 Jul 2024 12:04:08 +0200, Peter Korsgaard <peter@korsgaard.com> wrote:

> >>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
>
>  > On 12/06/2024 15:57, Peter Seiderer via buildroot wrote:
>  >> - add key hint for download signature check
>  >> - update COPYING hash due to [1] (change of home page URL)
>  >> For details see [2].
>
>  >  I've added a statement here to make clear this is not affected by the backdoor.
>
>  >  Peter, this is for 2024.02.x and 2024.05.x.
>
> OK. Looking at https://github.com/tukaani-project/xz/releases/tag/v5.4.7
> I see a mention about a shared library regression on mips64, but I am
> not sure where the mentioned patch can be found?

Do not see an upstream issue nor an suitable upstream patch..., the only
linking issue I know of is from the buildroot autobuilders see
https://lore.kernel.org/buildroot/20240703105013.1bd207f1@gmx.net/
(affects 5.6.2/5.4.7 but not 5.4.6 - and could be fixed by
'XZ_AUTORECONF = YES')...

>
> The 5.4.7 bugfixes do not look very critical, so we could alternatively
> also just not bump the version on 2024.02.x / 2024.05.x.
>

Fine by me...

Regards,
Peter

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/5] package/xz: bump version to 5.4.7

[Peter Seiderer via buildroot]

On Mon, 8 Jul 2024 14:54:36 +0200, Peter Seiderer <ps.report@gmx.net> wrote:

> Hello Peter, *,
>
> On Mon, 08 Jul 2024 12:04:08 +0200, Peter Korsgaard <peter@korsgaard.com> wrote:
>
> > >>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
> >
> >  > On 12/06/2024 15:57, Peter Seiderer via buildroot wrote:
> >  >> - add key hint for download signature check
> >  >> - update COPYING hash due to [1] (change of home page URL)
> >  >> For details see [2].
> >
> >  >  I've added a statement here to make clear this is not affected by the backdoor.
> >
> >  >  Peter, this is for 2024.02.x and 2024.05.x.
> >
> > OK. Looking at https://github.com/tukaani-project/xz/releases/tag/v5.4.7
> > I see a mention about a shared library regression on mips64, but I am
> > not sure where the mentioned patch can be found?

See "[xz-devel] Build system fix for XZ Utils 5.2.13, 5.4.7, and 5.6.2"
(https://www.mail-archive.com/xz-devel@tukaani.org/msg00682.html)...

Regards,
Peter

>
> Do not see an upstream issue nor an suitable upstream patch..., the only
> linking issue I know of is from the buildroot autobuilders see
> https://lore.kernel.org/buildroot/20240703105013.1bd207f1@gmx.net/
> (affects 5.6.2/5.4.7 but not 5.4.6 - and could be fixed by
> 'XZ_AUTORECONF = YES')...
>
> >
> > The 5.4.7 bugfixes do not look very critical, so we could alternatively
> > also just not bump the version on 2024.02.x / 2024.05.x.
> >
>
> Fine by me...
>
> Regards,
> Peter
>

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot