argyllcms: gcc5 compat
This commit is contained in:
parent
318ac091b2
commit
fc2b0e9d10
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
||||
curlOpts = "--user-agent 'Mozilla/5.0'";
|
||||
};
|
||||
|
||||
patches = [ ./gcc5.patch ];
|
||||
|
||||
# The contents of this file comes from the Jamtop file from the
|
||||
# root of the ArgyllCMS distribution, rewritten to pick up Nixpkgs
|
||||
# library paths. When ArgyllCMS is updated, make sure that changes
|
||||
|
20
pkgs/tools/graphics/argyllcms/gcc5.patch
Normal file
20
pkgs/tools/graphics/argyllcms/gcc5.patch
Normal file
@ -0,0 +1,20 @@
|
||||
Description: Fix FTBFS with GCC 5
|
||||
Author: James Cowgill <james410@cowgill.org.uk>
|
||||
Bug-Debian: https://bugs.debian.org/777779
|
||||
Forwarded: no
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
--- a/icc/icc.h
|
||||
+++ b/icc/icc.h
|
||||
@@ -100,7 +100,11 @@
|
||||
#define CF64PREC "LL" /* Constant precision specifier */
|
||||
|
||||
#ifndef ATTRIBUTE_NORETURN
|
||||
+#ifdef _MSC_VER
|
||||
# define ATTRIBUTE_NORETURN __declspec(noreturn)
|
||||
+#else
|
||||
+# define ATTRIBUTE_NORETURN __attribute__((noreturn))
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
#else /* !__STDC_VERSION__ */
|
Loading…
Reference in New Issue
Block a user