@@ -32,12 +32,13 @@ config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO
config BR2_PACKAGE_LIBBLOCKDEV_FS
bool "filesystem"
depends on BR2_ENABLE_LOCALE # parted
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted
select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
select BR2_PACKAGE_PARTED
select BR2_PACKAGE_E2FSPROGS
-comment "filesystem plugin needs a toolchain w/ locale"
- depends on !BR2_ENABLE_LOCALE
+comment "filesystem plugin needs a toolchain w/ locale, gcc >= 5"
+ depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5
config BR2_PACKAGE_LIBBLOCKDEV_LOOP
bool "loop"
@@ -45,11 +46,12 @@ config BR2_PACKAGE_LIBBLOCKDEV_LOOP
config BR2_PACKAGE_LIBBLOCKDEV_LVM2
bool "lvm2"
depends on BR2_ENABLE_LOCALE # parted
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted
select BR2_PACKAGE_PARTED
select BR2_PACKAGE_LVM2
-comment "lvm2 support needs a toolchain w/ locale"
- depends on !BR2_ENABLE_LOCALE
+comment "lvm2 support needs a toolchain w/ locale, gcc >= 5"
+ depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5
config BR2_PACKAGE_LIBBLOCKDEV_MDRAID
bool "mdraid"
@@ -64,11 +66,12 @@ config BR2_PACKAGE_LIBBLOCKDEV_NVME
config BR2_PACKAGE_LIBBLOCKDEV_PART
bool "part"
depends on BR2_ENABLE_LOCALE # parted
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted
select BR2_PACKAGE_PARTED
select BR2_PACKAGE_UTIL_LINUX_LIBFDISK
-comment "part plugin needs a toolchain w/ locale"
- depends on !BR2_ENABLE_LOCALE
+comment "part plugin needs a toolchain w/ locale, gcc >= 5"
+ depends on !BR2_ENABLE_LOCALE| | !BR2_TOOLCHAIN_GCC_AT_LEAST_5
config BR2_PACKAGE_LIBBLOCKDEV_SWAP
bool "swap"
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PARTED
bool "parted"
depends on BR2_ENABLE_LOCALE
depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help
@@ -9,5 +10,6 @@ config BR2_PACKAGE_PARTED
http://www.gnu.org/software/parted/
-comment "parted needs a toolchain w/ locale, wchar"
- depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
+comment "parted needs a toolchain w/ locale, wchar, gcc >=5"
+ depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_5
@@ -1,6 +1,7 @@
config BR2_PACKAGE_PYTHON_PYPARTED
bool "python-pyparted"
depends on BR2_ENABLE_LOCALE # parted
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted
depends on BR2_USE_WCHAR
select BR2_PACKAGE_PARTED
help
@@ -8,5 +9,6 @@ config BR2_PACKAGE_PYTHON_PYPARTED
https://github.com/rhinstaller/pyparted
-comment "pyparted needs a toolchain w/ locale, wchar"
- depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
+comment "pyparted needs a toolchain w/ locale, wchar, gcc >= 5"
+ depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_5
Fix the following build failure raised since bump to version 3.5 in commit 57817fe05a4250a260a08201812c6652b306a0e5 and https://git.savannah.gnu.org/cgit/parted.git/commit/?id=15c49ec04f7eaff014d2e1eddd0aecf4150db63d: gpt.c:181:5: error: initializer element is not constant { PED_PARTITION_APPLE_TV_RECOVERY, PARTITION_APPLE_TV_RECOVERY_GUID }, ^ gpt.c:181:5: error: (near initialization for 'flag_uuid_mapping[0].type_uuid') Fixes: 57817fe05a4250a260a08201812c6652b306a0e5 - http://autobuild.buildroot.org/results/1f0af75ec55da9052fbfb195a0699f84619eac81 - http://autobuild.buildroot.org/results/438b5f40e8b393801f36c691d239e298998cb9d2 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/libblockdev/Config.in | 15 +++++++++------ package/parted/Config.in | 6 ++++-- package/python-pyparted/Config.in | 6 ++++-- 3 files changed, 17 insertions(+), 10 deletions(-)