Revert "package/libcap: Fix build error with kernel headers < 3.6"

This reverts commit a759931c9b.
This commit is contained in:
Thomas Petazzoni 2014-10-28 11:58:58 +01:00
parent 1f3481268c
commit d5146f4b53
5 changed files with 6 additions and 16 deletions

View File

@ -3,7 +3,6 @@ config BR2_PACKAGE_CDRKIT
select BR2_PACKAGE_BZIP2
select BR2_PACKAGE_LIBCAP
depends on BR2_LARGEFILE
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 # libcap
depends on BR2_USE_MMU # fork
bool "cdrkit"
help
@ -13,6 +12,6 @@ config BR2_PACKAGE_CDRKIT
http://www.cdrkit.org/
comment "cdrkit needs a toolchain w/ largefile, headers >= 3.7"
comment "cdrkit needs a toolchain w/ largefile"
depends on BR2_USE_MMU
depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
depends on !BR2_LARGEFILE

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBCAP
bool "libcap"
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
help
This library implements the user-space interfaces to the
POSIX 1003.1e capabilities available in Linux kernels. These
@ -23,6 +22,3 @@ config BR2_PACKAGE_LIBCAP_TOOLS
CONFIG_EXT2_FS_XATTR and CONFIG_EXT2_FS_SECURITY for ext2).
endif
comment "libcap needs headers >= 3.7"
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7

View File

@ -3,7 +3,6 @@ config BR2_PACKAGE_LXC
select BR2_PACKAGE_LIBCAP
depends on BR2_INET_IPV6
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 # libcap
depends on BR2_LARGEFILE
depends on BR2_USE_MMU # fork()
depends on !BR2_avr32 # no timerfd
@ -15,9 +14,8 @@ config BR2_PACKAGE_LXC
https://linuxcontainers.org/
comment "lxc needs a toolchain w/ IPv6, threads, largefile, headers >= 3.7"
comment "lxc needs a toolchain w/ IPv6, threads, largefile"
depends on BR2_USE_MMU
depends on !BR2_avr32 # no timerfd
depends on !BR2_nios2 # the toolchain doesn't support setns syscall
depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE

View File

@ -1,14 +1,12 @@
comment "squid needs a toolchain w/ C++, IPv6, headers >= 3.7"
comment "squid needs a toolchain w/ C++, IPv6"
depends on BR2_USE_MMU
depends on !BR2_avr32 # toolchain too old
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6 || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6
config BR2_PACKAGE_SQUID
bool "squid"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_INET_IPV6
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 # libcap
# needs fork()
depends on BR2_USE_MMU
select BR2_PACKAGE_LIBCAP

View File

@ -15,7 +15,6 @@ config BR2_PACKAGE_SYSTEMD
depends on BR2_INET_IPV6
depends on !BR2_PREFER_STATIC_LIB # kmod
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 # libcap
depends on BR2_USE_MMU # dbus
select BR2_PACKAGE_HAS_UDEV
select BR2_PACKAGE_DBUS # runtime dependency only