gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apacheHttpdPackages.mod_tile: pull upstream fix for -fno-common

Browse Source 
Without che change build on upstream gcc-10 fails as:

    ld: src/renderd-gen_tile.o:/build/source/includes/daemon.h:48:
      multiple definition of `render_request_queue'; src/daemon.o:/build/source/includes/daemon.h:48: first defined here
This commit is contained in:
Sergei Trofimovich
2022-05-14 12:59:05 +01:00
parent 197681059f
commit 5f137cf5b7
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-modules/mod_tile/default.nix
+11 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }:
stdenv.mkDerivation rec {
pname = "mod_tile";
@@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "12c96avka1dfb9wxqmjd57j30w9h8yx4y4w34kyq6xnf6lwnkcxp";
};
patches = [
# Pull upstream fix for -fno-common toolchains:
# https://github.com/openstreetmap/mod_tile/pull/202
(fetchpatch {
name = "fno-common";
url = "https://github.com/openstreetmap/mod_tile/commit/a22065b8ae3c018820a5ca9bf8e2b2bb0a0bfeb4.patch";
sha256 = "1ywfa14xn9aa96vx1adn1ndi29qpflca06x986bx9c5pqk761yz3";
})
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ apacheHttpd apr cairo iniparser mapnik ];