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

[Peter Seiderer via buildroot <buildroot@buildroot.org>]

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