From: Peter Korsgaard Date: Sat, 2 Jun 2018 09:21:20 +0000 (+0200) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8b0fd3cb49566854fc038213e093e3c325618399;p=buildroot.git Merge branch 'next' Signed-off-by: Peter Korsgaard --- 8b0fd3cb49566854fc038213e093e3c325618399 diff --cc DEVELOPERS index f24ef2752e,a8b98407c3..413f37f1c3 --- a/DEVELOPERS +++ b/DEVELOPERS @@@ -693,12 -691,10 +696,13 @@@ F: package/libglib2 F: package/libgtk2/ F: package/libgtk3/ F: package/libidn/ + F: package/libidn2/ F: package/libjpeg/ +F: package/liblockfile/ F: package/libmatroska/ F: package/libmpdclient/ +F: package/libnetfilter_conntrack/ +F: package/libnetfilter_queue/ F: package/libupnp/ F: package/libupnp18/ F: package/minissdpd/ diff --cc package/ltrace/Config.in index 2defbe28a0,369f54a12e..667338a26e --- a/package/ltrace/Config.in +++ b/package/ltrace/Config.in @@@ -1,14 -1,3 +1,15 @@@ +config BR2_PACKAGE_LTRACE_ARCH_SUPPORTS + bool ++ default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_i386 + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_powerpc + default y if BR2_sparc + default y if BR2_x86_64 + default y if BR2_xtensa + config BR2_PACKAGE_LTRACE bool "ltrace" depends on BR2_USE_WCHAR # elfutils