From 0dbc17abcb5c254d60a8d59e1ae0d715c2db4324 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 9 Jan 2015 18:03:25 +0100 Subject: [PATCH] package/xz-utils: does not require threads Commit 799c12e (xz-utils: needs threads) tried to fix an autobuild failure by requiring threads. But xz-utils can be configured without thread support (even though it is one of the most prominent selling-points of the latest release!). [Thomas: use --{enable,disable}-threads instead of --enable-threads={yes,no}, to match what we generally do in most autotools packages.] Signed-off-by: "Yann E. MORIN" Cc: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/xz/Config.in | 4 ---- package/xz/xz.mk | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/xz/Config.in b/package/xz/Config.in index 55beb42911..50116f2995 100644 --- a/package/xz/Config.in +++ b/package/xz/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_XZ bool "xz-utils" - depends on BR2_TOOLCHAIN_HAS_THREADS help XZ is the successor to the Lempel-Ziv/Markov-chain Algorithm compression format, which provides memory-hungry but powerful @@ -13,6 +12,3 @@ config BR2_PACKAGE_XZ package. http://tukaani.org/xz/ - -comment "xz-utils needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 24b1adb9d9..413c0205e2 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -12,5 +12,11 @@ XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' XZ_LICENSE = GPLv2+ GPLv3+ LGPLv2.1+ XZ_LICENSE_FILES = COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +XZ_CONF_OPTS = --enable-threads +else +XZ_CONF_OPTS = --disable-threads +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.30.2