NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/osm2pgsql: needs gcc >= 4.9

Browse Source 
osm2pgsql needs C++14 since bump to version 1.5.1 in commit
a71661ffb2 and
d35dd358d6
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@gmail.com>
Reviewed-by: Maxim Kochetkov <fido_max@inbox.ru>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine 2021-09-05 10:40:45 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 29932ece35
commit 30a22bfe11
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/osm2pgsql/Config.in
View File

@ -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