forked from mirrors/nixpkgs
osrm-backend: 4.5.0 -> 4.9.1
This commit is contained in:
parent
0fdf7106e5
commit
0b96e0daf3
|
@ -1,18 +0,0 @@
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index b6a40f9..87ca301 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -261,9 +261,10 @@ target_link_libraries(OSRM ${STXXL_LIBRARY})
|
|
||||||
target_link_libraries(osrm-extract ${STXXL_LIBRARY})
|
|
||||||
target_link_libraries(osrm-prepare ${STXXL_LIBRARY})
|
|
||||||
|
|
||||||
-if(MINGW)
|
|
||||||
- # STXXL needs OpenMP library
|
|
||||||
- target_link_libraries(osrm-extract gomp)
|
|
||||||
+find_package(OpenMP)
|
|
||||||
+if (OPENMP_FOUND)
|
|
||||||
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
|
|
||||||
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_package( OSMPBF REQUIRED )
|
|
|
@ -1,17 +1,17 @@
|
||||||
{stdenv, fetchFromGitHub, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}:
|
{stdenv, fetchFromGitHub, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "osrm-backend-4.5.0";
|
name = "osrm-backend-${version}";
|
||||||
|
version = "4.9.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
rev = "v4.5.0";
|
rev = "v${version}";
|
||||||
owner = "Project-OSRM";
|
owner = "Project-OSRM";
|
||||||
repo = "osrm-backend";
|
repo = "osrm-backend";
|
||||||
sha256 = "19a8d1llvsrysyk1q48dpmh75qcbibfjlszndrysk11yh62hdvsz";
|
sha256 = "1r4dwniwxgfppnb9asdh98w5qxqwkjhp9gc5fabmck0gk73cwkcc";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./4.5.0-openmp.patch
|
|
||||||
./4.5.0-gcc-binutils.patch
|
./4.5.0-gcc-binutils.patch
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./4.5.0-default-profile-path.template.patch;
|
src = ./4.5.0-default-profile-path.template.patch;
|
||||||
|
|
Loading…
Reference in a new issue