From 0b96e0daf3d3cd0a01056612c8bf33739d2082e5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 27 Mar 2016 20:28:45 +0000 Subject: [PATCH] osrm-backend: 4.5.0 -> 4.9.1 --- pkgs/servers/osrm-backend/4.5.0-openmp.patch | 18 ------------------ pkgs/servers/osrm-backend/default.nix | 8 ++++---- 2 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 pkgs/servers/osrm-backend/4.5.0-openmp.patch diff --git a/pkgs/servers/osrm-backend/4.5.0-openmp.patch b/pkgs/servers/osrm-backend/4.5.0-openmp.patch deleted file mode 100644 index f4010131f602..000000000000 --- a/pkgs/servers/osrm-backend/4.5.0-openmp.patch +++ /dev/null @@ -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 ) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 9c1dd23b39f0..23c3b237c579 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -1,17 +1,17 @@ {stdenv, fetchFromGitHub, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}: stdenv.mkDerivation rec { - name = "osrm-backend-4.5.0"; + name = "osrm-backend-${version}"; + version = "4.9.1"; src = fetchFromGitHub { - rev = "v4.5.0"; + rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "19a8d1llvsrysyk1q48dpmh75qcbibfjlszndrysk11yh62hdvsz"; + sha256 = "1r4dwniwxgfppnb9asdh98w5qxqwkjhp9gc5fabmck0gk73cwkcc"; }; patches = [ - ./4.5.0-openmp.patch ./4.5.0-gcc-binutils.patch (substituteAll { src = ./4.5.0-default-profile-path.template.patch;