[Buildroot] [PATCH] linux-pam: unavailable for static builds

Gustavo Zacarias gustavo at zacarias.com.ar
Wed Jul 30 23:14:51 UTC 2014


Fixes:
http://autobuild.buildroot.net/results/3bb/3bb8d4662995a11e8e6cc5fdaaba9e25d4c0e0ec/

Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
---
 package/linux-pam/Config.in  |  6 ++++--
 package/rsh-redone/Config.in | 16 ++++++++++------
 package/util-linux/Config.in | 16 ++++++++++------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in
index 88bdd4f..72ef376 100644
--- a/package/linux-pam/Config.in
+++ b/package/linux-pam/Config.in
@@ -3,10 +3,12 @@ config BR2_PACKAGE_LINUX_PAM
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_FLEX
 	depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  A Security Framework that Provides Authentication for Applications
 
 	  http://linux-pam.org
 
-comment "linux-pam needs a toolchain w/ wchar, locale"
-	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
+comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library"
+	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
+		|| BR2_PREFER_STATIC_LIB
diff --git a/package/rsh-redone/Config.in b/package/rsh-redone/Config.in
index f636e2f..c8f2f51 100644
--- a/package/rsh-redone/Config.in
+++ b/package/rsh-redone/Config.in
@@ -14,21 +14,25 @@ config BR2_PACKAGE_RSH_REDONE_RLOGIN
 
 config BR2_PACKAGE_RSH_REDONE_RLOGIND
 	bool "rlogind"
-	select BR2_PACKAGE_LINUX_PAM
+	depends on !BR2_PREFER_STATIC_LIB
 	depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR
+	select BR2_PACKAGE_LINUX_PAM
 
-comment "rlogind needs a toolchain w/ wchar, locale"
-	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
+comment "rlogind needs a toolchain w/ wchar, locale, dynamic library"
+	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
+		|| BR2_PREFER_STATIC_LIB
 
 config BR2_PACKAGE_RSH_REDONE_RSH
 	bool "rsh"
 
 config BR2_PACKAGE_RSH_REDONE_RSHD
 	bool "rshd"
-	select BR2_PACKAGE_LINUX_PAM
 	depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR
+	depends on !BR2_PREFER_STATIC_LIB
+	select BR2_PACKAGE_LINUX_PAM
 
-comment "rshd needs a toolchain w/ wchar, locale"
-	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
+comment "rshd needs a toolchain w/ wchar, locale, dynamic library"
+	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
+		|| BR2_PREFER_STATIC_LIB
 
 endif
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 28bda11..934021a 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -58,13 +58,15 @@ config BR2_PACKAGE_UTIL_LINUX_ARCH
 
 config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH
 	bool "chfn/chsh"
-	select BR2_PACKAGE_LINUX_PAM
 	depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
+	depends on !BR2_PREFER_STATIC_LIB
+	select BR2_PACKAGE_LINUX_PAM
 	help
 	  Change login shell, real user name and information
 
-comment "chfn/chsh needs a toolchain w/ wchar, locale"
-	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
+comment "chfn/chsh needs a toolchain w/ wchar, locale, dynamic library"
+	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
+		|| BR2_PREFER_STATIC_LIB
 
 config BR2_PACKAGE_UTIL_LINUX_CRAMFS
 	bool "cramfs utilities"
@@ -100,13 +102,15 @@ config BR2_PACKAGE_UTIL_LINUX_KILL
 
 config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
 	bool "login utilities"
-	depends on BR2_ENABLE_LOCALE # linux-pam
+	depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
+	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_PACKAGE_LINUX_PAM
 	help
 	  Build login utilities (last, login, su, sulogin)
 
-comment "login utilities needs a toolchain w/ locale"
-	depends on !BR2_ENABLE_LOCALE
+comment "login utilities needs a toolchain w/ wchar, locale, dynamic library"
+	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
+		|| BR2_PREFER_STATIC_LIB
 
 config BR2_PACKAGE_UTIL_LINUX_LOSETUP
 	bool "losetup"
-- 
1.8.5.5



More information about the buildroot mailing list