From patchwork Thu Dec 8 08:33:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 45121 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 AC52027BBEE; Thu, 8 Dec 2022 10:15:12 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 DB4F627BBE9 for ; Thu, 8 Dec 2022 10:15:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3Dup-0004wp-4U; Thu, 08 Dec 2022 05:14:07 -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 1p3Dul-0004vQ-Tu for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3Duk-0000o2-CL for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3Duk-0008FK-7Q for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59896] [PATCH 2/5] gnu: clingo: Update to 5.6.2. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Dec 2022 10:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59896@debbugs.gnu.org Received: via spool by 59896-submit@debbugs.gnu.org id=B59896.167049441931643 (code B ref 59896); Thu, 08 Dec 2022 10:14:02 +0000 Received: (at 59896) by debbugs.gnu.org; 8 Dec 2022 10:13:39 +0000 Received: from localhost ([127.0.0.1]:55798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuN-0008EE-0P for submit@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:39 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:37783) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuL-0008Dx-3t for 59896@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:38 -0500 Received: by mail-ed1-f67.google.com with SMTP id l11so1432194edb.4 for <59896@debbugs.gnu.org>; Thu, 08 Dec 2022 02:13:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:content-transfer-encoding:to:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=Hx9S5E254BrOWZHQArgzdEXzZq/8Dufi/ZNrg6Hhxwo=; b=dag0wmRFj+bQatxTMfvK0So1FJQnF9mb7GBlobzFA8y/ZZMI99w1s7Npoa76kkoilw 2/cJcO6gMsLiv8UpxrWNZPzpbp90TKkKqLcwm1yO1VSEbX5w8eUeptFOL5gv+q6sya9e GxssUvVcIwRHDd92pHiScxH4z16eRVNdSDwwX4UMAgbr+BQeeP5WR0n9K0Oe9ITUs6o1 f0VViNF9mOF+Y/2GsLm90adR4+uXEojWkqcoB3W+ZHdmI2UP2kv09C9K/hGceSy8ghNH whRPoG64OlUU8ZTKfmN1CyTv0CKj5H+Q69rLp4TFhvP7MQY1VQ78OhWFjXvNw/xN+fOR 6AGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:content-transfer-encoding:to:mime-version:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Hx9S5E254BrOWZHQArgzdEXzZq/8Dufi/ZNrg6Hhxwo=; b=qhspDpKeVhGVO5waJjppJIo5Xrh7ZZjqsCI7NnaWggq1X5Y8bHlail16lv8UOeWBD8 sNo0vXQFSAPoNeGJ1u2TzyiF1YmczoLQCkYBLxFgpE/c+3dQCd3Xb8bOZLLWfYqTLCHI mat3Nk1P+vv2yCPJ0bRWqSv8OnVu8Nt1OmyiXiizOTSpBOCta8N5yEMQsEQog1Yg6xd4 mUMkfQw/on3cJaMjuMNdmB/fNEZ8lR5cFWZtCjwOP8cmgTKWZtJn9+W/Q8hWcyjSTZuD 482Q/kDSU5Ewz3whakTpzlt0JMDVfUSJI67TSViGFF0Pthmxtl3Hv4juDMl9KCkb0xjG HltA== X-Gm-Message-State: ANoB5plj8YUZjd+PoFkHTCmxrwHjDaf12mercUEqncVLM9MmWIphFN9Y 8GfoWnqS8W3ZNPUn3DQJ53i/Ba5AkJQ= X-Google-Smtp-Source: AA0mqf7A8UiLaUzQiDTYonPTBTGuPoFBwjaoxcZ9L0wwcv8k2/eJt3YDSAi2fa+l5TmZ+swF3OXG9g== X-Received: by 2002:aa7:c585:0:b0:46b:635a:ed8f with SMTP id g5-20020aa7c585000000b0046b635aed8fmr36308845edq.406.1670494411319; Thu, 08 Dec 2022 02:13:31 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q3-20020aa7da83000000b0046c91fa5a4asm3207309eds.70.2022.12.08.02.13.30 for <59896@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 02:13:31 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 8 Dec 2022 09:33:05 +0100 MIME-Version: 1.0 Message-ID: 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/maths.scm (clingo): Update to 5.6.2. [source]: Unbundle clasp and catch. [arguments]<#:configure-flags>: Add “-DCLINGO_USE_LOCAL_CLASP=off” and “-DCLINGO_USE_LOCAL_CATCH=off”. [inputs]: Add catch2-3.1. [native-inputs]: Add pkg-config. --- gnu/packages/maths.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c0bc07977b..6a55284308 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2625,27 +2625,30 @@ (define-public clasp (define-public clingo (package (name "clingo") - (version "5.5.0") + (version "5.6.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/potassco/clingo") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + #~(begin + (delete-file-recursively "clasp") + ;; TODO: Unvendor other third-party stuff + (delete-file-recursively "third_party/catch"))) (sha256 (base32 - "0rfjwkcwm0mmf3r4i7asyjwb6cia4i7px7fn2kdbi9j85qvas4pb")))) + "19s59ndcm2yj0kxlikfxnx2bmp6b7n31wq1zvwc7hyk37rqarwys")))) (build-system cmake-build-system) (arguments `(#:configure-flags `("-DCLINGO_BUILD_TESTS=on" "-DCLINGO_INSTALL_LIB=on" "-DCLINGO_BUILD_STATIC=off" "-DCLINGO_BUILD_SHARED=on" - ;; XXX: Clingo requries private headers and - ;; sources from clasp - ,(string-append - "-DCLASP_SOURCE_DIR=" - (assoc-ref %build-inputs "clasp-src"))) + "-DCLINGO_USE_LOCAL_CLASP=off" + "-DCLINGO_USE_LOCAL_CATCH=off") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-cmake @@ -2677,10 +2680,8 @@ (define-public clingo "unpool-ast-v2" "parse_term" "propagator" "propgator-sequence-mining" "symbol" "visitor")))))))))) - (inputs - (list clasp libpotassco)) - (native-inputs - `(("clasp-src" ,(package-source clasp)))) + (inputs (list catch2-3.1 clasp libpotassco)) + (native-inputs (list pkg-config)) (home-page "https://potassco.org/") (synopsis "Grounder and solver for logic programs") (description "Clingo computes answer sets for a given logic program.")