From fc2b0e9d1006dd3656b804154f3ba438540da832 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 16 Sep 2015 21:58:53 -0700 Subject: [PATCH] argyllcms: gcc5 compat --- pkgs/tools/graphics/argyllcms/default.nix | 2 ++ pkgs/tools/graphics/argyllcms/gcc5.patch | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/graphics/argyllcms/gcc5.patch diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index a8ffc634d0e1..fce383dcc9c4 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -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 diff --git a/pkgs/tools/graphics/argyllcms/gcc5.patch b/pkgs/tools/graphics/argyllcms/gcc5.patch new file mode 100644 index 000000000000..28067455c33e --- /dev/null +++ b/pkgs/tools/graphics/argyllcms/gcc5.patch @@ -0,0 +1,20 @@ +Description: Fix FTBFS with GCC 5 +Author: James Cowgill +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__ */