cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

www/osrm-backend: fix build on GCC architectures

Browse Source 
Merge two upstream commits to fix build:
/wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/src/storage/io_config.cpp: In member function 'bool osrm::storage::IOConfig::IsValid() const':
/wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/src/storage/io_config.cpp:18:89: error: call of overloaded 'is_regular_file(<brace-enclosed initializer list>)' is ambiguous
   18 |         if (!boost::filesystem::is_regular_file({base_path.string() + fileName.string()}))
      |                                                                                         ^
In file included from /usr/local/include/boost/filesystem.hpp:18,
                 from /wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/include/storage/io_config.hpp:8,
                 from /wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/src/storage/io_config.cpp:1:
/usr/local/include/boost/filesystem/directory.hpp:171:20: note: candidate: 'bool boost::filesystem::is_regular_file(const boost::filesystem::directory_entry&)'
  171 | inline bool        is_regular_file(const directory_entry& e) BOOST_NOEXCEPT { return filesystem::is_regular_file(e.status()); }
      |                    ^~~~~~~~~~~~~~~
In file included from /usr/local/include/boost/filesystem.hpp:19,
                 from /wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/include/storage/io_config.hpp:8,
                 from /wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/src/storage/io_config.cpp:1:
/usr/local/include/boost/filesystem/operations.hpp:169:6: note: candidate: 'bool boost::filesystem::is_regular_file(const boost::filesystem::path&)'
  169 | bool is_regular_file(const path& p)  {return is_regular_file(detail::status(p));}
      |      ^~~~~~~~~~~~~~~

MFH:		2020Q3 (fix build blanket)
This commit is contained in:
Piotr Kubaj 2020-08-17 20:01:15 +00:00
parent f5b8642f6a
commit c8c5d9de25
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=545180
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/osrm-backend/Makefile
View File

@ -6,6 +6,10 @@ DISTVERSION= 5.22.0
PORTREVISION= 9 PORTREVISION= 9
CATEGORIES= www CATEGORIES= www
PATCH_SITES= https://github.com/Project-OSRM/osrm-backend/commit/
PATCHFILES= 38700e207e076a391f30ef66ad90d03e7543006e.patch:-p1 \
018a9bc80449d85c0e40fa5215377d8a03264c88.patch:-p1
MAINTAINER= freebsd@mosedal.net MAINTAINER= freebsd@mosedal.net
COMMENT= Open Source Routing Machine (Backend) COMMENT= Open Source Routing Machine (Backend)

6
www/osrm-backend/distinfo
View File

@ -1,3 +1,7 @@
TIMESTAMP = 1548918753 TIMESTAMP = 1597690747
SHA256 (Project-OSRM-osrm-backend-v5.22.0_GH0.tar.gz) = df0987a04bcf65d74f9c4e18f34a01982bf3bb97aa47f9d86cfb8b35f17a6a55 SHA256 (Project-OSRM-osrm-backend-v5.22.0_GH0.tar.gz) = df0987a04bcf65d74f9c4e18f34a01982bf3bb97aa47f9d86cfb8b35f17a6a55
SIZE (Project-OSRM-osrm-backend-v5.22.0_GH0.tar.gz) = 6492998 SIZE (Project-OSRM-osrm-backend-v5.22.0_GH0.tar.gz) = 6492998
SHA256 (38700e207e076a391f30ef66ad90d03e7543006e.patch) = 2c353e7e942df92091cf138f9c47135a74dc6f70bcad6897b118b312ca226ad6
SIZE (38700e207e076a391f30ef66ad90d03e7543006e.patch) = 2165
SHA256 (018a9bc80449d85c0e40fa5215377d8a03264c88.patch) = 7ad04466e0ac4a5dcafc5bb38a1ac20039339c73f0e32475c25d4614b353ec61
SIZE (018a9bc80449d85c0e40fa5215377d8a03264c88.patch) = 3214