[Buildroot] [PATCH 1/1] package/osm2pgsql: needs gcc >= 4.9

Arnout Vandecappelle arnout at mind.be
Sat Sep 11 20:46:12 UTC 2021



On 05/09/2021 10:40, Fabrice Fontaine wrote:
> osm2pgsql needs C++14 since bump to version 1.5.1 in commit
> a71661ffb216c7423dcd02ec9e8d703252dbcbad and
> https://github.com/openstreetmap/osm2pgsql/commit/d35dd358d6e4a88a792be60c85bf55d2360c1a71
> to avoid the following build failure:
> 
> /home/buildroot/autobuild/instance-1/output-1/build/osm2pgsql-1.5.1/src/db-copy.cpp: In member function 'void db_copy_thread_t::sync_and_wait()':
> /home/buildroot/autobuild/instance-1/output-1/build/osm2pgsql-1.5.1/src/db-copy.cpp:108:16: error: 'make_unique' is not a member of 'std'
>      add_buffer(std::make_unique<db_cmd_sync_t>(std::move(barrier)));
>                 ^
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/30ae4b9405454919437098d29abbd743638c9423
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>

 Applied to master, thanks.

 Regards,
 Arnout

> ---
>  package/osm2pgsql/Config.in | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in
> index d31191b3a7..315f496d8e 100644
> --- a/package/osm2pgsql/Config.in
> +++ b/package/osm2pgsql/Config.in
> @@ -1,7 +1,7 @@
>  config BR2_PACKAGE_OSM2PGSQL
>  	bool "osm2pgsql"
>  	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_GCC_AT_LEAST_4_9 # C++14
>  	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
> @@ -23,10 +23,10 @@ config BR2_PACKAGE_OSM2PGSQL
>  
>  	  https://osm2pgsql.org
>  
> -comment "osm2pgsql needs a toolchain w/ C++,  wchar, threads, gcc >= 4.7"
> +comment "osm2pgsql needs a toolchain w/ C++,  wchar, threads, gcc >= 4.9"
>  	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
> +		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS
>  
>  comment "osm2pgsql needs a toolchain not affected by GCC bug 64735"
>  	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
> 


More information about the buildroot mailing list