From 02a199105d88b295cac5bbce3d48f896e5605300 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 6 Aug 2023 23:51:27 +0200 Subject: [PATCH] package/libheif: let's use BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 Let's use binutils bug define instead of architecture checking in packages. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/kodi-imagedecoder-heif/Config.in | 4 ++-- package/libheif/Config.in | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/kodi-imagedecoder-heif/Config.in b/package/kodi-imagedecoder-heif/Config.in index 7cf2d1ef6e..d0950385a0 100644 --- a/package/kodi-imagedecoder-heif/Config.in +++ b/package/kodi-imagedecoder-heif/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_KODI_IMAGEDECODER_HEIF bool "kodi-imagedecoder-heif" depends on BR2_INSTALL_LIBSTDCPP # libde265, libheif, tinyxml2 depends on BR2_TOOLCHAIN_HAS_THREADS # libde265 - depends on !BR2_m68k_cf # libheif + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 # libheif depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libheif select BR2_PACKAGE_LIBDE265 select BR2_PACKAGE_LIBHEIF @@ -13,6 +13,6 @@ config BR2_PACKAGE_KODI_IMAGEDECODER_HEIF https://github.com/xbmc/imagedecoder.heif comment "kodi-imagedecoder-heif needs a toolchain w/ C++, threads, gcc >= 4.8" - depends on !BR2_m68k_cf # libheif + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 # libheif depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/libheif/Config.in b/package/libheif/Config.in index d0ea72430e..1452cf2718 100644 --- a/package/libheif/Config.in +++ b/package/libheif/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_LIBHEIF bool "libheif" - # avoid build error - # Internal error in emit_expr_encoded at dw2gencfi.c:215 - depends on !BR2_m68k_cf + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help @@ -11,5 +9,5 @@ config BR2_PACKAGE_LIBHEIF https://github.com/strukturag/libheif comment "libheif needs a toolchain w/ C++, gcc >= 4.8" - depends on !BR2_m68k_cf + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8