From patchwork Sun Jun 18 20:53:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51060 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 5E45E27BBE2; Sun, 18 Jun 2023 21:54:30 +0100 (BST) 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=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 D75B027BBE9 for ; Sun, 18 Jun 2023 21:54:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAzPS-0006dV-7J; Sun, 18 Jun 2023 16:54:06 -0400 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 1qAzPP-0006c8-WF for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:04 -0400 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 1qAzPP-0002Et-Nu for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAzPP-0007T3-KB for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v2 6/8] gnu: clingo: Unbundle dependencies. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 20:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.168712162828631 (code B ref 64137); Sun, 18 Jun 2023 20:54:03 +0000 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:53:48 +0000 Received: from localhost ([127.0.0.1]:55051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP9-0007Rc-PB for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:48 -0400 Received: from mout01.posteo.de ([185.67.36.65]:43123) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP4-0007Qc-C4 for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:43 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D04AA240028 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:53:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121616; bh=bGN3wv57J4LTWNemHR0S4uZqLFnhCnJZ65ieXd0040s=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=anl9a5wHOgOvPtI7yFX4wSi6bPHtaEUsxoUtenYUOr0azEak/QLcirJAf9HlgAb1s CHuFMGYL9PUUFo34i89/oyii7bcvXQryZE5TfQQkIfbhTCz73GjST/WUV6G9GGCxZO my7UAA+Fbn6IHV2OqCuevWyEdGQDbiqzQaRquatM1LG+YXGY1+700Hn5KBq9iU8vZ3 ikrAp8GJEpq+EI/jkuSl30l728ULOUIs+5aECF0o13L1D5rTUKAW3fIVV+jJJmT+sO GgLJWp3y39kJ3T6zvA6CEi6XD5wR/gSA6sFaf228mT7iGLk6lM0EysEZTgbI+bWYTG 4T95gjDWg2MAQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklVS3fBzz9rxL; Sun, 18 Jun 2023 22:53:36 +0200 (CEST) From: David Elsing Date: Sun, 18 Jun 2023 20:53:05 +0000 Message-Id: In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> 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/potassco.scm: (clingo) [arguments]<#:phases>: Patch CMakeLists.txt files to use external dependencies. [native-inputs]: Add mpark-variant, tl-optional, tsl-hopscotch-map, tsl-ordered-map and tsl-sparse-map. --- gnu/packages/potassco.scm | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index 03d243cdc7..b8e51e7d47 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022, 2023 Liliana Marie Prikler ;;; Copyright © 2023 Simon Tournier +;;; Copyright © 2023 David Elsing ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ (define-module (gnu packages potassco) #:use-module (guix build-system python) #:use-module (guix build-system pyproject) #:use-module (gnu packages check) + #:use-module (gnu packages cpp) #:use-module (gnu packages graphviz) #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) @@ -153,8 +155,7 @@ (define-public clingo (snippet #~(begin (delete-file-recursively "clasp") - ;; TODO: Unvendor other third-party stuff - (delete-file-recursively "third_party/catch"))) + (delete-file-recursively "third_party"))) (sha256 (base32 "19s59ndcm2yj0kxlikfxnx2bmp6b7n31wq1zvwc7hyk37rqarwys")))) @@ -173,12 +174,22 @@ (define-public clingo (lambda _ (substitute* "CMakeLists.txt" (("add_subdirectory\\(clasp\\)") - "find_package(clasp REQUIRED)")) + "find_package(clasp REQUIRED)") + (("add_subdirectory\\(third_party\\)") + (string-append + "find_package(tsl-hopscotch-map)\n" + "find_package(tl-optional)\n" + "find_package(mpark_variant)\n" + "find_package(tsl-sparse-map)\n" + "find_package(tsl-ordered-map)\n" + "find_package(Catch2 3 REQUIRED)"))) (substitute* "libclingo/CMakeLists.txt" (("\"cmake/Clingo\"") "\"cmake/clingo\"") (("ClingoConfig\\.cmake") "clingo-config.cmake") (("ClingoConfigVersion\\.cmake") "clingo-config-version.cmake")) + (substitute* "libgringo/CMakeLists.txt" + (("mpark::variant") "mpark_variant")) (substitute* "cmake/ClingoConfig.cmake.in" (("find_package\\(Clasp") "find_package(clasp")) (rename-file "cmake/ClingoConfig.cmake.in" @@ -199,7 +210,12 @@ (define-public clingo "propagator" "propgator-sequence-mining" "symbol" "visitor")))))))))) (inputs (list catch2-3.1 clasp libpotassco)) - (native-inputs (list pkg-config)) + (native-inputs (list mpark-variant + pkg-config + tl-optional + tsl-hopscotch-map + tsl-ordered-map + tsl-sparse-map)) (home-page "https://potassco.org/") (synopsis "Grounder and solver for logic programs") (description "Clingo computes answer sets for a given logic program.")