From d4811802acbd16488adc32a7e340067700cec85c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 21 Feb 2022 23:38:42 +0100 Subject: [PATCH] package/osm2pgsql: disable external fmt osm2pgsql doesn't support fmt > 8.0 yet resulting in the following build failure since bump of fmt to version 8.1.1 in commit ec7fd50d08690a383fec40748ac9b78c3f764316: /home/buildroot/autobuild/instance-0/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt 1728 | formattable, | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/osm2pgsql/Config.in | 5 ++--- package/osm2pgsql/osm2pgsql.mk | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index 315f496d8e..e903e92c49 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -1,17 +1,16 @@ config BR2_PACKAGE_OSM2PGSQL bool "osm2pgsql" - depends on BR2_INSTALL_LIBSTDCPP # boost, fmt, libosmium, protozero + depends on BR2_INSTALL_LIBSTDCPP # boost, 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 + depends on BR2_USE_WCHAR # boost, 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 select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBOSMIUM select BR2_PACKAGE_PROTOZERO select BR2_PACKAGE_ZLIB diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index b00976d28b..d389fff590 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -10,12 +10,13 @@ OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO -OSM2PGSQL_DEPENDENCIES = boost bzip2 expat fmt libosmium postgresql protozero zlib +OSM2PGSQL_DEPENDENCIES = boost bzip2 expat libosmium postgresql protozero zlib +# fmt > 8.0 is not yet supported OSM2PGSQL_CONF_OPTS = \ -DBUILD_TESTS=OFF \ -DBUILD_COVERAGE=OFF \ - -DEXTERNAL_FMT=ON \ + -DEXTERNAL_FMT=OFF \ -DEXTERNAL_LIBOSMIUM=ON \ -DEXTERNAL_PROTOZERO=ON