Revert "lvm2: disable build with uClibc-ng"

This reverts commit 66f136a9f64b880eefa769c1261916773d8f28c0.

Issue fixed with uClibc-ng update to 1.0.24.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Waldemar Brodkorb 2017-04-26 09:26:47 +02:00 committed by Thomas Petazzoni
parent fd806578a9
commit 2480b2e125
5 changed files with 8 additions and 15 deletions

View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_CRYPTSETUP
depends on BR2_USE_MMU # lvm2 depends on BR2_USE_MMU # lvm2
depends on !BR2_STATIC_LIBS # lvm2 depends on !BR2_STATIC_LIBS # lvm2
depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
depends on !BR2_TOOLCHAIN_USES_UCLIBC # lvm2
select BR2_PACKAGE_POPT select BR2_PACKAGE_POPT
select BR2_PACKAGE_LVM2 select BR2_PACKAGE_LVM2
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
@ -16,7 +15,7 @@ config BR2_PACKAGE_CRYPTSETUP
https://gitlab.com/cryptsetup/cryptsetup https://gitlab.com/cryptsetup/cryptsetup
comment "cryptsetup needs a glibc toolchain w/ threads, dynamic library" comment "cryptsetup needs a glibc or uClibc toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
|| BR2_TOOLCHAIN_USES_MUSL || BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL

View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_DMRAID
depends on BR2_USE_MMU # lvm2 depends on BR2_USE_MMU # lvm2
depends on !BR2_STATIC_LIBS # lvm2 depends on !BR2_STATIC_LIBS # lvm2
depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
depends on !BR2_TOOLCHAIN_USES_UCLIBC # lvm2
select BR2_PACKAGE_LVM2 select BR2_PACKAGE_LVM2
help help
dmraid discovers, activates, deactivates and displays properties dmraid discovers, activates, deactivates and displays properties
@ -13,7 +12,7 @@ config BR2_PACKAGE_DMRAID
dmraid uses the Linux device-mapper to create devices with dmraid uses the Linux device-mapper to create devices with
respective mappings for the ATARAID sets discovered. respective mappings for the ATARAID sets discovered.
comment "dmraid needs a glibc toolchain w/ threads, dynamic library" comment "dmraid needs a glibc or uClibc toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
|| BR2_TOOLCHAIN_USES_MUSL || BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL

View File

@ -47,7 +47,6 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER
depends on BR2_USE_MMU # lvm2 depends on BR2_USE_MMU # lvm2
depends on !BR2_STATIC_LIBS # lvm2 depends on !BR2_STATIC_LIBS # lvm2
depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
depends on !BR2_TOOLCHAIN_USES_UCLIBC # lvm2
select BR2_PACKAGE_LVM2 select BR2_PACKAGE_LVM2
select BR2_PACKAGE_LVM2_APP_LIBRARY select BR2_PACKAGE_LVM2_APP_LIBRARY
help help

View File

@ -5,7 +5,6 @@ config BR2_PACKAGE_LVM2
depends on !BR2_STATIC_LIBS # It fails to build statically depends on !BR2_STATIC_LIBS # It fails to build statically
# http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html # http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html
depends on !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_TOOLCHAIN_USES_MUSL
depends on !BR2_TOOLCHAIN_USES_UCLIBC # missing floorl(), nearbyintl()
help help
This is LVM2, the rewrite of The Linux Logical Volume Manager. This is LVM2, the rewrite of The Linux Logical Volume Manager.
LVM supports enterprise level volume management of disk and disk LVM supports enterprise level volume management of disk and disk
@ -39,7 +38,6 @@ config BR2_PACKAGE_LVM2_APP_LIBRARY
endif endif
comment "lvm2 needs a glibc toolchain w/ threads, dynamic library" comment "lvm2 needs a glibc or uClibc toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL
|| BR2_TOOLCHAIN_USES_MUSL || BR2_TOOLCHAIN_USES_UCLIBC

View File

@ -5,7 +5,6 @@ config BR2_PACKAGE_UDISKS
depends on BR2_USE_MMU # lvm2 depends on BR2_USE_MMU # lvm2
depends on !BR2_STATIC_LIBS # lvm2 depends on !BR2_STATIC_LIBS # lvm2
depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
depends on !BR2_TOOLCHAIN_USES_UCLIBC # lvm2
select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS
select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_DBUS_GLIB
depends on BR2_USE_WCHAR # dbus-glib -> glib2 depends on BR2_USE_WCHAR # dbus-glib -> glib2
@ -41,8 +40,7 @@ comment "udisks needs udev /dev management"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_PACKAGE_HAS_UDEV depends on !BR2_PACKAGE_HAS_UDEV
comment "udisks needs a glibc toolchain w/ wchar, threads, dynamic library" comment "udisks needs a glibc or uClibc toolchain w/ wchar, threads, dynamic library"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL \ BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
|| BR2_TOOLCHAIN_USES_UCLIBC