From 076dd96812718844704e3f2aa680eba2acfca352 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 26 Mar 2016 17:38:50 +0000 Subject: [PATCH] osrm-backend: add patch fixing build by un-hard-coding gcc-ar and gcc-ranlib paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 7a3e154c27b5df288ddd3f428adc1e1030fcf88c) Signed-off-by: Domen Kožar --- .../servers/osrm-backend/4.5.0-gcc-binutils.patch | 15 +++++++++++++++ pkgs/servers/osrm-backend/default.nix | 1 + 2 files changed, 16 insertions(+) create mode 100644 pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch diff --git a/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch b/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch new file mode 100644 index 000000000000..87b9b9501c4c --- /dev/null +++ b/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -127,8 +127,9 @@ if(CMAKE_BUILD_TYPE MATCHES Release) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND + NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW) + message(STATUS "Using gcc specific binutils for LTO.") +- set(CMAKE_AR "/usr/bin/gcc-ar") +- set(CMAKE_RANLIB "/usr/bin/gcc-ranlib") ++ # Just let PATH do its job ++ set(CMAKE_AR "gcc-ar") ++ set(CMAKE_RANLIB "gcc-ranlib") + endif() + endif (HAS_LTO_FLAG) + endif() diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 51dc0acad3a7..9c1dd23b39f0 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./4.5.0-openmp.patch + ./4.5.0-gcc-binutils.patch (substituteAll { src = ./4.5.0-default-profile-path.template.patch; })