aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-09-25 16:40:34 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-09-25 16:40:34 +0200
commit193cbb3d61cdf3b69e8c00e9b84df66364c52766 (patch)
tree555894f8df4125d5afa9230ef9bc942b4a6ab82c
parent70c7b7c79920dd6500ba5e4e88fe147cc44923d8 (diff)
downloadpatches-193cbb3d61cdf3b69e8c00e9b84df66364c52766.tar
patches-193cbb3d61cdf3b69e8c00e9b84df66364c52766.tar.gz
gnu: freeimage: Build with the C++ 11 standard.
This is a follow-up to commit 942c7889498fc8e680a16d500e166c9ade84e640. * gnu/packages/image.scm (freeimage)[arguments]: Pass -std=gnu++11 in CFLAGS.
-rw-r--r--gnu/packages/image.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 2a9ee990be..dbc0159e22 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -981,8 +981,11 @@ supplies a generic doubly-linked list and some string functions.")
;; We need '-fpermissive' for Source/FreeImage.h.
;; libjxr doesn't have a pkg-config file.
(string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden -fpermissive "
- ;"-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib"
- ))
+ ;;"-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib"
+
+ ;; FIXME: OpenEXR 2.4.0 requires C++11 or later.
+ ;; Remove when the default compiler is > GCC 5.
+ "-std=gnu++11"))
#:tests? #f)) ; no check target
(native-inputs
`(("pkg-config" ,pkg-config)