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>

diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in
index 6b92886cf1aeceb5752eec695eb989731a7ed010..f5088b967fce3e8af334ea1bcdc4f9a233e097a3 100644 (file)
--- 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 8e22eff0052ac3ba0da12fbaf25831f08e0eabd4..98cbeb9206a5d7e238afbcf10fd204933a168f25 100644 (file)
--- 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 6c7bc63d762c8330d2344f6ad5718f92a6836d53..b23a8e01724125ea4fb4bb9cd59934c7c49c7a21 100644 (file)
--- 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 218b47ce4acb022725b263e38e70471796b09b86..316ff7a1db6e6d78ef84e9ba479c35444e24fe64 100644 (file)
--- 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 39df11cb388e80197b426e19ca48c3c620f47aa7..cc6e9a500ba01fcdd3cd44be5c657d21bea56301 100644 (file)
--- 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"