Date: Mon, 17 Aug 2020 20:02:05 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r545181 - branches/2020Q3/www/osrm-backend Message-ID: <202008172002.07HK254f025881@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Mon Aug 17 20:02:04 2020 New Revision: 545181 URL: https://svnweb.freebsd.org/changeset/ports/545181 Log: MFH: r545180 www/osrm-backend: fix build on GCC architectures 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));} | ^~~~~~~~~~~~~~~ Approved by: portmgr (fix build blanket) Modified: branches/2020Q3/www/osrm-backend/Makefile branches/2020Q3/www/osrm-backend/distinfo Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/www/osrm-backend/Makefile ============================================================================== --- branches/2020Q3/www/osrm-backend/Makefile Mon Aug 17 20:01:15 2020 (r545180) +++ branches/2020Q3/www/osrm-backend/Makefile Mon Aug 17 20:02:04 2020 (r545181) @@ -6,6 +6,10 @@ DISTVERSION= 5.22.0 PORTREVISION= 8 CATEGORIES= www +PATCH_SITES= https://github.com/Project-OSRM/osrm-backend/commit/ +PATCHFILES= 38700e207e076a391f30ef66ad90d03e7543006e.patch:-p1 \ + 018a9bc80449d85c0e40fa5215377d8a03264c88.patch:-p1 + MAINTAINER= freebsd@mosedal.net COMMENT= Open Source Routing Machine (Backend) Modified: branches/2020Q3/www/osrm-backend/distinfo ============================================================================== --- branches/2020Q3/www/osrm-backend/distinfo Mon Aug 17 20:01:15 2020 (r545180) +++ branches/2020Q3/www/osrm-backend/distinfo Mon Aug 17 20:02:04 2020 (r545181) @@ -1,3 +1,7 @@ -TIMESTAMP = 1548918753 +TIMESTAMP = 1597690747 SHA256 (Project-OSRM-osrm-backend-v5.22.0_GH0.tar.gz) = df0987a04bcf65d74f9c4e18f34a01982bf3bb97aa47f9d86cfb8b35f17a6a55 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008172002.07HK254f025881>