From owner-svn-ports-all@freebsd.org Mon Aug 17 20:01:16 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9AF113BAC38; Mon, 17 Aug 2020 20:01:16 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BVlKm3VJNz49jW; Mon, 17 Aug 2020 20:01:16 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B6CA25CF7; Mon, 17 Aug 2020 20:01:16 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07HK1Gg4024717; Mon, 17 Aug 2020 20:01:16 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07HK1Fte024715; Mon, 17 Aug 2020 20:01:15 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202008172001.07HK1Fte024715@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 17 Aug 2020 20:01:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545180 - head/www/osrm-backend X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/www/osrm-backend X-SVN-Commit-Revision: 545180 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2020 20:01:16 -0000 Author: pkubaj Date: Mon Aug 17 20:01:15 2020 New Revision: 545180 URL: https://svnweb.freebsd.org/changeset/ports/545180 Log: 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()' 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) Modified: head/www/osrm-backend/Makefile head/www/osrm-backend/distinfo Modified: head/www/osrm-backend/Makefile ============================================================================== --- head/www/osrm-backend/Makefile Mon Aug 17 19:37:57 2020 (r545179) +++ head/www/osrm-backend/Makefile Mon Aug 17 20:01:15 2020 (r545180) @@ -6,6 +6,10 @@ DISTVERSION= 5.22.0 PORTREVISION= 9 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: head/www/osrm-backend/distinfo ============================================================================== --- head/www/osrm-backend/distinfo Mon Aug 17 19:37:57 2020 (r545179) +++ head/www/osrm-backend/distinfo Mon Aug 17 20:01:15 2020 (r545180) @@ -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