summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Naour <romain.naour@openwide.fr>2015-08-08 00:47:13 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-08-08 11:02:07 +0200
commitb81ee16e8e6ac699e29f0f43f1a9546456127056 (patch)
tree624036cd71e0017965574389f69d177ed35cc223
parenteb60820c0a9b3f938f32516f24df2eee9aac1e26 (diff)
downloadbuildroot-b81ee16e8e6ac699e29f0f43f1a9546456127056.tar.gz
buildroot-b81ee16e8e6ac699e29f0f43f1a9546456127056.zip
package/rng-tools: needs argp-standalone with musl toolchains
Since argp-standalone is only available for uClibc-ng and musl toolchains, it's safe to link with it when the package is selected. Signed-off-by: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/rng-tools/Config.in2
-rw-r--r--package/rng-tools/rng-tools.mk5
2 files changed, 4 insertions, 3 deletions
diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in
index 43c5a1c2e5..469b60e89b 100644
--- a/package/rng-tools/Config.in
+++ b/package/rng-tools/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_RNG_TOOLS
bool "rng-tools"
- select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
+ select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
# For rdrand ligcrypt is required and it's not obvious to users
select BR2_PACKAGE_LIBGCRYPT if BR2_i386 || BR2_x86_64
help
diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk
index 8648c4f878..7e975e048e 100644
--- a/package/rng-tools/rng-tools.mk
+++ b/package/rng-tools/rng-tools.mk
@@ -9,8 +9,9 @@ RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RN
RNG_TOOLS_LICENSE = GPLv2
RNG_TOOLS_LICENSE_FILES = COPYING
-# Work around for uClibc's lack of argp_*() functions
-ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
+# Work around for uClibc or musl toolchains which lack argp_*()
+# functions.
+ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
RNG_TOOLS_CONF_ENV += LIBS="-largp"
RNG_TOOLS_DEPENDENCIES += argp-standalone
endif
OpenPOWER on IntegriCloud