aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Brendan Heading <brendanheading@gmail.com>2015-08-20 23:32:13 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-08-26 15:25:09 +0200
commit25ecd24579f293ef4fcc6847094c4af39f4113af (patch)
treea12187774b630b83974a68ff37579ca2feda27af
parent1a07750cc55b83730fc264dc6c35bb8efebd5bf4 (diff)
downloadbuildroot-25ecd24579f293ef4fcc6847094c4af39f4113af.tar.gz
buildroot-25ecd24579f293ef4fcc6847094c4af39f4113af.tar.bz2
packages/linux-pam: disable when using musl
Fixes: http://autobuild.buildroot.net/results/e33/e337d69420ad00b2cc4017d639a31803926f2353/ linux-pam needs some surgery to build under musl, so for the time being disable it until the issues are solved. Also disables dependent package python-pam, and dependent suboptions under openvmtools, rsh-redone and util-linux. Signed-off-by: Brendan Heading <brendanheading@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/linux-pam/Config.in5
-rw-r--r--package/openvmtools/Config.in5
-rw-r--r--package/python-pam/Config.in6
-rw-r--r--package/rsh-redone/Config.in10
-rw-r--r--package/util-linux/Config.in10
5 files changed, 22 insertions, 14 deletions
diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in
index 6b92886cf1..f5088b967f 100644
--- a/package/linux-pam/Config.in
+++ b/package/linux-pam/Config.in
@@ -10,11 +10,12 @@ config BR2_PACKAGE_LINUX_PAM
# https://lists.fedorahosted.org/pipermail/linux-pam-commits/2012-February/000105.html
# for details.
depends on !BR2_STATIC_LIBS
+ depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
help
A Security Framework that Provides Authentication for Applications
http://linux-pam.org
-comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library"
+comment "linux-pam needs a uClibc or (e)glibc toolchain w/ wchar, locale, dynamic library"
depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
- || BR2_STATIC_LIBS
+ || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in
index 8e22eff005..98cbeb9206 100644
--- a/package/openvmtools/Config.in
+++ b/package/openvmtools/Config.in
@@ -36,11 +36,12 @@ config BR2_PACKAGE_OPENVMTOOLS_PAM
# linux-pam needs locale and wchar, but we already have this
# dependency on the main symbol, above.
depends on !BR2_STATIC_LIBS
+ depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
help
Support for PAM in openvmtools
-comment "PAM support needs a toolchain w/ dynamic library"
- depends on BR2_STATIC_LIBS
+comment "PAM support needs a uClibc or (e)glibc toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
endif
diff --git a/package/python-pam/Config.in b/package/python-pam/Config.in
index 6c7bc63d76..b23a8e0172 100644
--- a/package/python-pam/Config.in
+++ b/package/python-pam/Config.in
@@ -1,6 +1,7 @@
-comment "python-pam needs a toolchain w/ wchar, locale, dynamic library"
+comment "python-pam needs a uClibc or (e)glibc toolchain w/ wchar, locale, dynamic library"
depends on BR2_PACKAGE_PYTHON
- depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
+ depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS || \
+ BR2_TOOLCHAIN_USES_MUSL
config BR2_PACKAGE_PYTHON_PAM
bool "python-pam"
@@ -8,6 +9,7 @@ config BR2_PACKAGE_PYTHON_PAM
depends on BR2_ENABLE_LOCALE # linux-pam
depends on BR2_USE_WCHAR # linux-pam
depends on !BR2_STATIC_LIBS # linux-pam
+ depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
select BR2_PACKAGE_LINUX_PAM
help
PAM (Pluggable Authentication Module) bindings for Python.
diff --git a/package/rsh-redone/Config.in b/package/rsh-redone/Config.in
index 218b47ce4a..316ff7a1db 100644
--- a/package/rsh-redone/Config.in
+++ b/package/rsh-redone/Config.in
@@ -16,11 +16,12 @@ config BR2_PACKAGE_RSH_REDONE_RLOGIND
bool "rlogind"
depends on !BR2_STATIC_LIBS
depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
select BR2_PACKAGE_LINUX_PAM
-comment "rlogind needs a toolchain w/ wchar, locale, dynamic library"
+comment "rlogind needs a uClibc or (e)glibc toolchain w/ wchar, locale, dynamic library"
depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
- || BR2_STATIC_LIBS
+ || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
config BR2_PACKAGE_RSH_REDONE_RSH
bool "rsh"
@@ -29,10 +30,11 @@ config BR2_PACKAGE_RSH_REDONE_RSHD
bool "rshd"
depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR
depends on !BR2_STATIC_LIBS
+ depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
select BR2_PACKAGE_LINUX_PAM
-comment "rshd needs a toolchain w/ wchar, locale, dynamic library"
+comment "rshd needs a uClibc or (e)glibc toolchain w/ wchar, locale, dynamic library"
depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
- || BR2_STATIC_LIBS
+ || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
endif
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 39df11cb38..cc6e9a500b 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -66,13 +66,14 @@ config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH
bool "chfn/chsh"
depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
depends on !BR2_STATIC_LIBS
+ depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
select BR2_PACKAGE_LINUX_PAM
help
Change login shell, real user name and information
-comment "chfn/chsh needs a toolchain w/ wchar, locale, dynamic library"
+comment "chfn/chsh needs a uClibc or (e)glibc toolchain w/ wchar, locale, dynamic library"
depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
- || BR2_STATIC_LIBS
+ || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
config BR2_PACKAGE_UTIL_LINUX_CRAMFS
bool "cramfs utilities"
@@ -124,13 +125,14 @@ config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
bool "login utilities"
depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
depends on !BR2_STATIC_LIBS
+ depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
select BR2_PACKAGE_LINUX_PAM
help
Build login utilities (last, login, su, sulogin)
-comment "login utilities needs a toolchain w/ wchar, locale, dynamic library"
+comment "login utilities needs a uClibc or (e)glibc toolchain w/ wchar, locale, dynamic library"
depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
- || BR2_STATIC_LIBS
+ || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
config BR2_PACKAGE_UTIL_LINUX_LOSETUP
bool "losetup"