Home Explore Help
Sign In
PUBLIC_REPOS
/
buildroot
mirror of git://git.buildroot.net/buildroot
2
1
Fork 0
Files
Browse Source

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<T> specialization: https://fmt.dev/latest/api.html#udt
 1728 |       formattable,
      |       ^~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb

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>
Fabrice Fontaine 3 years ago
parent
1e1976a25d
commit
d4811802ac
2 changed files with 5 additions and 5 deletions
Unified View Show Diff Stats
  1. 2 3
      package/osm2pgsql/Config.in
  2. 3 2
      package/osm2pgsql/osm2pgsql.mk

+ 2 - 3
package/osm2pgsql/Config.in
View File 

@@ -1,17 +1,16 @@
 
 config BR2_PACKAGE_OSM2PGSQL
 
 config BR2_PACKAGE_OSM2PGSQL
 
 	bool "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_GCC_AT_LEAST_4_9 # C++14
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium
 
 	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem
 
 	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
 
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
 
 	select BR2_PACKAGE_BOOST
 
 	select BR2_PACKAGE_BOOST
 
 	select BR2_PACKAGE_BOOST_SYSTEM
 
 	select BR2_PACKAGE_BOOST_SYSTEM
 
 	select BR2_PACKAGE_BOOST_FILESYSTEM
 
 	select BR2_PACKAGE_BOOST_FILESYSTEM
 
 	select BR2_PACKAGE_BZIP2
 
 	select BR2_PACKAGE_BZIP2
 
 	select BR2_PACKAGE_EXPAT
 
 	select BR2_PACKAGE_EXPAT
 
-	select BR2_PACKAGE_FMT
 
 	select BR2_PACKAGE_LIBOSMIUM
 
 	select BR2_PACKAGE_LIBOSMIUM
 
 	select BR2_PACKAGE_PROTOZERO
 
 	select BR2_PACKAGE_PROTOZERO
 
 	select BR2_PACKAGE_ZLIB
 
 	select BR2_PACKAGE_ZLIB

+ 3 - 2
package/osm2pgsql/osm2pgsql.mk
View File 

@@ -10,12 +10,13 @@ OSM2PGSQL_LICENSE = GPL-2.0+
 
 OSM2PGSQL_LICENSE_FILES = COPYING
 
 OSM2PGSQL_LICENSE_FILES = COPYING
 
 OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO
 
 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 = \
 
 OSM2PGSQL_CONF_OPTS = \
 
 	-DBUILD_TESTS=OFF \
 
 	-DBUILD_TESTS=OFF \
 
 	-DBUILD_COVERAGE=OFF \
 
 	-DBUILD_COVERAGE=OFF \
 
-	-DEXTERNAL_FMT=ON \
 
+	-DEXTERNAL_FMT=OFF \
 
 	-DEXTERNAL_LIBOSMIUM=ON \
 
 	-DEXTERNAL_LIBOSMIUM=ON \
 
 	-DEXTERNAL_PROTOZERO=ON
 
 	-DEXTERNAL_PROTOZERO=ON