Browse Source

keyutils: uses dl*, disable for static build

And drop the unused static handling from the .mk file.

Fixes:
http://autobuild.buildroot.net/results/8a2/8a2ff0af4faeda4d2d224dcaf543a574d7eba30c/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Peter Korsgaard 10 years ago
parent
commit
15ab99a7f1
3 changed files with 7 additions and 5 deletions
  1. 1 1
      package/ecryptfs-utils/Config.in
  2. 6 0
      package/keyutils/Config.in
  3. 0 4
      package/keyutils/keyutils.mk

+ 1 - 1
package/ecryptfs-utils/Config.in

@@ -13,7 +13,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnss -> libnspr
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnss -> libnspr
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr
 	depends on !BR2_MIPS_NABI32 # libnss
 	depends on !BR2_MIPS_NABI32 # libnss
-	depends on !BR2_STATIC_LIBS # libnss
+	depends on !BR2_STATIC_LIBS # libnss, keyutils
 	help
 	help
 	  eCryptfs is a POSIX-compliant enterprise cryptographic
 	  eCryptfs is a POSIX-compliant enterprise cryptographic
 	  filesystem for Linux. It is stacked on top of any other
 	  filesystem for Linux. It is stacked on top of any other

+ 6 - 0
package/keyutils/Config.in

@@ -2,8 +2,14 @@ config BR2_PACKAGE_KEYUTILS
 	bool "keyutils"
 	bool "keyutils"
 	depends on !BR2_microblaze
 	depends on !BR2_microblaze
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_MMU # fork()
+	depends on !BR2_STATIC_LIBS # dlopen
 	help
 	help
 	  These tools are used to control the key management system
 	  These tools are used to control the key management system
 	  built into the Linux kernel.
 	  built into the Linux kernel.
 
 
 	  http://people.redhat.com/~dhowells/keyutils/
 	  http://people.redhat.com/~dhowells/keyutils/
+
+comment "keyutils needs a toolchain w/ dynamic library"
+	depends on !BR2_microblaze
+	depends on BR2_USE_MMU
+	depends on BR2_STATIC_LIBS

+ 0 - 4
package/keyutils/keyutils.mk

@@ -19,10 +19,6 @@ KEYUTILS_MAKE_PARAMS =                    \
 	CPPFLAGS="$(TARGET_CPPFLAGS) -I." \
 	CPPFLAGS="$(TARGET_CPPFLAGS) -I." \
 	LNS="$(HOSTLN) -sf"
 	LNS="$(HOSTLN) -sf"
 
 
-ifeq ($(BR2_STATIC_LIBS),y)
-KEYUTILS_MAKE_PARAMS += NO_SOLIB=1
-endif
-
 ifeq ($(BR2_SHARED_LIBS),y)
 ifeq ($(BR2_SHARED_LIBS),y)
 KEYUTILS_MAKE_PARAMS += NO_ARLIB=1
 KEYUTILS_MAKE_PARAMS += NO_ARLIB=1
 endif
 endif