From 9b752da0e93177a12b37f8809a5b7a12c83882cd Mon Sep 17 00:00:00 2001 From: Julien Desgats Date: Fri, 15 Nov 2019 11:43:18 +0000 Subject: [PATCH] Fixed install issue with libosrm_guidance See https://github.com/Project-OSRM/osrm-backend/pull/5604 --- .SRCINFO | 4 +++- PKGBUILD | 9 ++++++--- fix-guidance-so.patch | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 fix-guidance-so.patch diff --git a/.SRCINFO b/.SRCINFO index e433836d3f07..8dd2139ec462 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = osrm-backend pkgdesc = High performance routing engine written in C++14 designed to run on OpenStreetMap data. pkgver = 5.22.0 - pkgrel = 3 + pkgrel = 4 url = http://map.project-osrm.org/ arch = x86_64 license = BSD @@ -13,8 +13,10 @@ pkgbase = osrm-backend depends = intel-tbb source = osrm-backend-5.22.0.tar.gz::https://github.com/Project-OSRM/osrm-backend/archive/v5.22.0.tar.gz source = fix-boost-fs.patch + source = fix-guidance-so.patch sha256sums = df0987a04bcf65d74f9c4e18f34a01982bf3bb97aa47f9d86cfb8b35f17a6a55 sha256sums = 2c353e7e942df92091cf138f9c47135a74dc6f70bcad6897b118b312ca226ad6 + sha256sums = 5866c256dcfd63806d696483e2b9ca9b74edb969697ba4ac3025948c892c1407 pkgname = osrm-backend diff --git a/PKGBUILD b/PKGBUILD index 6ce350754ce8..4c425ebc2850 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=osrm-backend pkgver=5.22.0 -pkgrel=3 +pkgrel=4 pkgdesc="High performance routing engine written in C++14 designed to run on OpenStreetMap data." url="http://map.project-osrm.org/" depends=("expat" "boost-libs" "lua52" "intel-tbb") @@ -10,13 +10,16 @@ makedepends=("cmake" "boost") arch=('x86_64') license=('BSD') source=("$pkgname-$pkgver.tar.gz::https://github.com/Project-OSRM/osrm-backend/archive/v$pkgver.tar.gz" - "fix-boost-fs.patch") + "fix-boost-fs.patch" + "fix-guidance-so.patch") sha256sums=("df0987a04bcf65d74f9c4e18f34a01982bf3bb97aa47f9d86cfb8b35f17a6a55" - "2c353e7e942df92091cf138f9c47135a74dc6f70bcad6897b118b312ca226ad6") + "2c353e7e942df92091cf138f9c47135a74dc6f70bcad6897b118b312ca226ad6" + "5866c256dcfd63806d696483e2b9ca9b74edb969697ba4ac3025948c892c1407") prepare() { cd "$pkgname-$pkgver" patch --forward --strip=1 --input="${srcdir}/fix-boost-fs.patch" + patch --forward --strip=1 --input="${srcdir}/fix-guidance-so.patch" } build() { diff --git a/fix-guidance-so.patch b/fix-guidance-so.patch new file mode 100644 index 000000000000..f736a4f0c0ad --- /dev/null +++ b/fix-guidance-so.patch @@ -0,0 +1,24 @@ +commit 46ab931c648f89f8a92f9b8f389944934eb184c0 +Author: Julien Desgats +Date: Fri Nov 15 10:19:04 2019 +0000 + + fix: install the osrm_guidance library + + In the case of a shared object compilation, the resulting binaries need + that library. It was not installed along the others, leading to failures + when running osrm-extract. + + Fixes #5603 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27abf3008..0b1aaf3ab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -778,6 +778,7 @@ install(TARGETS osrm_customize DESTINATION lib) + install(TARGETS osrm_update DESTINATION lib) + install(TARGETS osrm_contract DESTINATION lib) + install(TARGETS osrm_store DESTINATION lib) ++install(TARGETS osrm_guidance DESTINATION lib) + + + # Install profiles and support library to /usr/local/share/osrm/profiles by default