From patchwork Fri Dec 8 22:22:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 57425 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 372B327BBE9; Fri, 8 Dec 2023 22:23:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 599CC27BBE2 for ; Fri, 8 Dec 2023 22:23:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBjFG-000443-2v; Fri, 08 Dec 2023 17:22:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBjFB-00042y-O8 for guix-patches@gnu.org; Fri, 08 Dec 2023 17:22:49 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBjFB-0007OP-4m for guix-patches@gnu.org; Fri, 08 Dec 2023 17:22:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBjFO-0007yu-9i for guix-patches@gnu.org; Fri, 08 Dec 2023 17:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67719] [PATCH 2/3] gnu: darktable: Build with GCC again. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Dec 2023 22:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67719 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67719@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 67719-submit@debbugs.gnu.org id=B67719.170207417530639 (code B ref 67719); Fri, 08 Dec 2023 22:23:02 +0000 Received: (at 67719) by debbugs.gnu.org; 8 Dec 2023 22:22:55 +0000 Received: from localhost ([127.0.0.1]:46427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBjFG-0007y6-WA for submit@debbugs.gnu.org; Fri, 08 Dec 2023 17:22:55 -0500 Received: from mout01.posteo.de ([185.67.36.65]:51303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBjFB-0007x9-TE for 67719@debbugs.gnu.org; Fri, 08 Dec 2023 17:22:53 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 138E3240027 for <67719@debbugs.gnu.org>; Fri, 8 Dec 2023 23:22:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1702074151; bh=RtoBXOnvQWSMYM7K8uTfmXMyw40CODfuEkLSqQIVp48=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=MaHafvzl2DSyopCqSwUxf0vgNVIUtXFVtaLS3T1mkfuYY0DI6AyKfBnI2J6wCFPYF oZm4xU97sf9sTxtVl7LWx+LBQI9jWdUGvDw0z0o+VzYKRghpXjv4YkuX1azGmTz/hi RK5PDv+zj9QxourdpZGdwdocEfKrgvpmCesDOKa3zYax5J4ywNG4Yk+LFsCyiFt7vn RAGMl0n5IRJd60VX9fplH0Q8SGKzTn691s0uxcR7AV3WjaixcCA4iiY1eJz28uBMNS 9u3AMwHYaUZ7hrXwgwY4tMSJ4PHRRkV5+lNTJE0lli80lpca0v4sapIF/TycXgkzq8 D7jhZ9cju6aLQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Sn5HB230rz6tn4; Fri, 8 Dec 2023 23:22:30 +0100 (CET) From: Vinicius Monego Date: Fri, 8 Dec 2023 22:22:06 +0000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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