tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

osrm-backend: add patch fixing build by un-hard-coding gcc-ar and gcc-ranlib paths

(cherry picked from commit 7a3e154c27b5df288ddd3f428adc1e1030fcf88c)
Signed-off-by: Domen Kožar <domen@dev.si>

authored by Robert Scott and committed by Domen Kožar 076dd968 93961289

+16
unified split
+15
pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch
···
··· 1 + diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + --- a/CMakeLists.txt 3 + +++ b/CMakeLists.txt 4 + @@ -127,8 +127,9 @@ if(CMAKE_BUILD_TYPE MATCHES Release) 5 + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND 6 + NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW) 7 + message(STATUS "Using gcc specific binutils for LTO.") 8 + - set(CMAKE_AR "/usr/bin/gcc-ar") 9 + - set(CMAKE_RANLIB "/usr/bin/gcc-ranlib") 10 + + # Just let PATH do its job 11 + + set(CMAKE_AR "gcc-ar") 12 + + set(CMAKE_RANLIB "gcc-ranlib") 13 + endif() 14 + endif (HAS_LTO_FLAG) 15 + endif()
+1
pkgs/servers/osrm-backend/default.nix
··· 12 13 patches = [ 14 ./4.5.0-openmp.patch 15 (substituteAll { 16 src = ./4.5.0-default-profile-path.template.patch; 17 })
··· 12 13 patches = [ 14 ./4.5.0-openmp.patch 15 + ./4.5.0-gcc-binutils.patch 16 (substituteAll { 17 src = ./4.5.0-default-profile-path.template.patch; 18 })