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

Fixing vxl build with gcc 5.

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2016-03-22 11:30:37 +01:00
parent c1901038c8
commit 56bd6be2cf
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/vxl/default.nix
View File

@ -20,12 +20,13 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [ ./gcc5.patch ];
meta = { meta = {
description = "C++ Libraries for Computer Vision Research and Implementation"; description = "C++ Libraries for Computer Vision Research and Implementation";
homepage = http://vxl.sourceforge.net/; homepage = http://vxl.sourceforge.net/;
license = "VXL License"; license = "VXL License";
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
broken = true; # requires fix for gcc 5: https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20150216/1511118.html
}; };
} }

15
pkgs/development/libraries/vxl/gcc5.patch Normal file
View File

@ -0,0 +1,15 @@
https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20150216/1511118.html
--- vxl-git4e07960/vcl/vcl_compiler.h~ 2012-11-02 12:08:21.000000000 +0100
+++ vxl-git4e07960/vcl/vcl_compiler.h 2015-02-15 13:50:46.376329878 +0100
@@ -119,6 +119,10 @@
# else
# define VCL_GCC_40
# endif
+# elif (__GNUC__== 5)
+// pretend GCC 5 to be GCC 4
+# define VCL_GCC_4
+# define VCL_GCC_41
# else
# error "Dunno about this gcc"
# endif