From: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Date: Thu, 26 Aug 2021 21:40:39 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7dac56b76e8b081b01ba5d979d0f842c5cfed5bc;p=buildroot.git

Merge branch 'master' into next

Conflicts:
	package/go/go.hash
	package/go/go.mk

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---

7dac56b76e8b081b01ba5d979d0f842c5cfed5bc
diff --cc boot/arm-trusted-firmware/arm-trusted-firmware.mk
index d1eb72e7ae,00b68a30af..9d44a5df06
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@@ -162,14 -165,10 +165,15 @@@ endi
  ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \
  	$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS))
  
 +ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH))
 +
  define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
 +	$(if $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH),
 +		cp -f $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH) $(@D)/fdts/
 +	)
  	$(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
- 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
+ 	$(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \
+ 		$(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
  		$(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
  	$(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_BUILD)
  endef
diff --cc package/osm2pgsql/Config.in
index 70d59e6c6f,f9fafb857c..d31191b3a7
--- a/package/osm2pgsql/Config.in
+++ b/package/osm2pgsql/Config.in
@@@ -3,8 -3,8 +3,9 @@@ config BR2_PACKAGE_OSM2PGSQ
  	depends on BR2_INSTALL_LIBSTDCPP # boost, fmt, libosmium, protozero
  	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, libosmium, protozero
  	depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium
 +	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem
  	depends on BR2_USE_WCHAR # boost, fmt, libosmium
+ 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
  	select BR2_PACKAGE_BOOST
  	select BR2_PACKAGE_BOOST_SYSTEM
  	select BR2_PACKAGE_BOOST_FILESYSTEM
@@@ -23,6 -23,8 +24,9 @@@
  	  https://osm2pgsql.org
  
  comment "osm2pgsql needs a toolchain w/ C++,  wchar, threads, gcc >= 4.7"
 +	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
  	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
  		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS
+ 
+ comment "osm2pgsql needs a toolchain not affected by GCC bug 64735"
+ 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735