alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

vxl: remove obsolete patch

Browse source
This commit is contained in:
Robin Gloster 2016-08-03 13:19:52 +00:00
parent 98473cdb15
commit 3f9e8601f2
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/vxl/default.nix
View file

@ -22,8 +22,6 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
patches = [ ./gcc5.patch ];
meta = {
description = "C++ Libraries for Computer Vision Research and Implementation";
homepage = http://vxl.sourceforge.net/;

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

@ -1,15 +0,0 @@
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