瀏覽代碼

Revert "package/xz: convert to cmake build"

The conversion to cmake was supposed to be an RFC, and was not supposed
to be applied [0], as the cmake support is not yet complete, while the
autotools buildsystem is still functional [1].

The host-xz uses the target options, which is plain wrong. The target
options forcubly disable shared libraries for no apparent reason, which
causes the host build to also disable shared libs, which in turn causes
host-python3 to fails to build. host-python3 has no dependency on
host-xz, but it autodetects its presence, so if the build order caused
host-xz to be built before host-python3, its presence will be detected
(this needs to be fixed in host-python3 anyway, though) [2].

It also creates build issues in our reference envirnoment [3]

Finally, there was a typo in the CXX override:
    -DCMAKE_CXX_COMPILER_LAUNCHER==""

This reverts commit 3f464c2e2826f02d9ee6f738df67c078e37cb327.

Fixes: #5

[0] https://lore.kernel.org/buildroot/20240626103623.7d7412c0@gmx.net/
[1] https://tukaani.org/xz/#_building_from_xz_git
[2] https://gitlab.com/buildroot.org/buildroot/-/issues/5
[3] https://lore.kernel.org/buildroot/ZnqUPBAcDbB7ND64@tl-lnx-nyma7486-2/

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Yann E. MORIN 1 年之前
父節點
當前提交
de278d626b
共有 1 個文件被更改,包括 40 次插入25 次删除
  1. 40 25
      package/xz/xz.mk

+ 40 - 25
package/xz/xz.mk

@@ -8,45 +8,60 @@ XZ_VERSION = 5.6.2
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)
 XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)
 XZ_INSTALL_STAGING = YES
 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 = 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_LICENSE_FILES = COPYING COPYING.0BSD COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
 XZ_CPE_ID_VENDOR = tukaani
 XZ_CPE_ID_VENDOR = tukaani
 
 
 XZ_CONF_OPTS = \
 XZ_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" \
-	-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
+	--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
 
 
 ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
 ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
-XZ_CONF_OPTS += -DENABLE_NLS=ON
+XZ_CONF_OPTS += --enable-nls
 else
 else
-XZ_CONF_OPTS += -DENABLE_NLS=OFF
+XZ_CONF_OPTS += --disable-nls
 endif
 endif
 
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-XZ_CONF_OPTS += -DENABLE_THREADS=ON
+XZ_CONF_OPTS += --enable-threads
 else
 else
-XZ_CONF_OPTS += -DENABLE_THREADS=OFF
+XZ_CONF_OPTS += --disable-threads
 endif
 endif
 
 
-# we are built before ccache
 HOST_XZ_CONF_OPTS = \
 HOST_XZ_CONF_OPTS = \
 	$(XZ_CONF_OPTS) \
 	$(XZ_CONF_OPTS) \
-	-DENABLE_NLS=ON \
-	-DENABLE_THREADS=ON \
-	-DCMAKE_C_COMPILER_LAUNCHER="" \
-	-DCMAKE_CXX_COMPILER_LAUNCHER==""
+	--enable-nls \
+	--enable-threads
+
+# we are built before ccache
+HOST_XZ_CONF_ENV = \
+	CC="$(HOSTCC_NOCCACHE)" \
+	CXX="$(HOSTCXX_NOCCACHE)"
 
 
-$(eval $(cmake-package))
-$(eval $(host-cmake-package))
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))