浏览代码

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" <yann.morin.1998@free.fr>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Yann E. MORIN 10 年之前
父节点
当前提交
0dbc17abcb
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 0 4
      package/xz/Config.in
  2. 6 0
      package/xz/xz.mk

+ 0 - 4
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

+ 6 - 0
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))