From: Vinicius Monego <monego@posteo.net>
To: 67719@debbugs.gnu.org
Cc: Vinicius Monego <monego@posteo.net>
Subject: [bug#67719] [PATCH 2/3] gnu: darktable: Build with GCC again.
Date: Fri, 8 Dec 2023 22:22:06 +0000 [thread overview]
Message-ID: <fbea74fb69077edf23dd2de8c206e3e6e87f5cce.1702073949.git.monego@posteo.net> (raw)
In-Reply-To: <cover.1702073949.git.monego@posteo.net>
* gnu/packages/photo.scm (darktable)[arguments][#:phases]: Delete the
'prepare-build-environment phase.
[native-inputs]: Remove clang. Add gcc-13.
Change-Id: Ia0dc1c6a717ccd00cd31d378aa51ce63fbf1806a
---
gnu/packages/photo.scm | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 86b7fbd15c..aa857a1d83 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -54,6 +54,7 @@ (define-module (gnu packages photo)
#:use-module (gnu packages curl)
#:use-module (gnu packages file)
#:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages geo)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
@@ -553,17 +554,6 @@ (define-public darktable
(string-append "\""
(search-input-file inputs "/lib/libOpenCL.so")
"\"")))))
- (add-before 'configure 'prepare-build-environment
- (lambda _
- ;; Rawspeed fails to build with GCC due to OpenMP error:
- ;; "undefined reference to `GOMP_loop_nonmonotonic_dynamic_next'"
- (setenv "CC" "clang")
- (setenv "CXX" "clang++")
- ;; Darktable looks for opencl-c.h in the LLVM dir. Guix installs
- ;; it to the Clang dir. We fix this by patching CMakeLists.txt.
- (substitute* "CMakeLists.txt"
- (("\\$\\{LLVM_INSTALL_PREFIX\\}")
- #$(this-package-native-input "clang")))))
(add-before 'configure 'set-LDFLAGS
(lambda _
(setenv "LDFLAGS"
@@ -576,13 +566,13 @@ (define-public darktable
(,(string-append #$(this-package-input "gtk+")
"/share/glib-2.0/schemas")))))))))
(native-inputs
- (list clang
- cmocka
+ (list cmocka
desktop-file-utils
+ gcc-13 ; gcc-11 too old for darktable, 12+ required
`(,glib "bin")
gobject-introspection
intltool
- llvm ;should match the Clang version
+ llvm
opencl-headers
perl
pkg-config
--
2.39.2
next prev parent reply other threads:[~2023-12-08 22:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-08 22:20 [bug#67719] [PATCH 0/3] GMIC, Darktable updates Vinicius Monego
2023-12-08 22:22 ` [bug#67719] [PATCH 1/3] gnu: gmic: Update to 3.3.2 Vinicius Monego
2023-12-08 22:22 ` Vinicius Monego [this message]
2023-12-08 22:22 ` [bug#67719] [PATCH 3/3] gnu: darktable: Enable more optional features Vinicius Monego
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fbea74fb69077edf23dd2de8c206e3e6e87f5cce.1702073949.git.monego@posteo.net \
--to=monego@posteo.net \
--cc=67719@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.