From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 2CkrD2cRmGRlbwAASxT56A (envelope-from ) for ; Sun, 25 Jun 2023 12:05:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id YHI3D2cRmGSWkwAA9RJhRA (envelope-from ) for ; Sun, 25 Jun 2023 12:05:27 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CAD693A8EE for ; Sun, 25 Jun 2023 12:05:26 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=QaFyYIy+; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687687527; a=rsa-sha256; cv=none; b=qyNnklLM5JufM+rjI20Rryl23DJXIl/qW7WajwRpLmgTGhQH2Os2upfdwN0wu+pD8ORvJJ EHrMSg1ju2SgEk2N42zhTIsjcmRGgw/va/kIuEVcX1Ik4JDe5R1lPxiJCwAPSMCdpAJpxx CKHVFlAL8ylBKE9CFGtBki856J7r0hjVAuXCT4AjxecOvM0dNtJMR8MuOFtbZDi60LwPgO r7N4mdPS5ZSk8khrdJnoDjW0+GGcAjgajZMr5tz56mxV/nPuxNM+6pjqSUkCxdlCDG0tg8 pGf2vo8bzuSm3OBYHAYOKW5TSe3cUO3g23eisAmvBrfBTQzSDamdL0jp5L0JJg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=QaFyYIy+; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687687527; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=nLFYRnHzyvyxVjLgu9BNeSiGv0IEfvfyFkHbBfi0e6A=; b=gnwP/rnxnB7tkx6/7SzHAyBMJ1mrnnO6K+EMwb2lXEjVZc22wmACFW8Ok+V+e13iWnfQVG p+digxFptZzfM4FTLVtqDxYuX9oYYh0YGiY58psiQzsDZzIy+K1c+HBQmQ4bcw8B+6CUqK m78f6pgTB1JLKEd/PQOHPLPqMP0r+zXoiCPHYvh+kFY1WZRobuTABLOeMpV/ZGyr0ry7Va JMgh+AiVgq4plOQebNKvvEng57b7FlOmFv93DGUaljhTFYIPibnFvbu5/gBNtmyiLatZ8B myWyNLpihT/+JzP2+EODINBXj83zwnLNoMreK8g3U4hpXYZYkqphyr9YRgZ90g== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDMcE-0002sV-1b; Sun, 25 Jun 2023 06:05: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 1qDMcD-0002sA-4P for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:05 -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 1qDMcC-0008SU-Ra for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDMcC-0000Lc-N2 for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v3 6/7] gnu: clingo: Unbundle dependencies. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 10:05:04 +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.16876874871256 (code B ref 64137); Sun, 25 Jun 2023 10:05:04 +0000 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 10:04:47 +0000 Received: from localhost ([127.0.0.1]:42053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbu-0000KA-M9 for submit@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:47 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbq-0000JZ-1Z for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:42 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 87C0A240103 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 12:04:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687687476; bh=kBt7ohEFVPmVsL8JgkhH1lKM957/jLpIajmpQpBoNYY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=QaFyYIy+DCm319hyZBUqdhNHsfNTuz+m4iCrwKPZymhWKI8NeKJ9GwNF68LkBONAJ YPtfyuXRevCKiSXn4Q7cp+ZaquYumV64jEeZBNqsXrDrjoBAIcU48+7nIV+6apQbwr LhVI2CM8NbOnT9TcEvMXiN5jHEj1xfpFquSZPKg43ekpub06wXVGRWHuCRyeVMwGUM qtOfiiF5gdIcKSR9Ylwz3P9xvfy5ZLIXpuisooFmcDzSdgCgpUVDWWp7ipaJ+wmM+c 00abC8+LODkWwRG82dWpjXb383iQaeppr5DvhVtXpv4PnFKGenPsZK/kbVcY5v9F+E plaT/2UGZpOjg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QpmmM6fXVz9rxB; Sun, 25 Jun 2023 12:04:35 +0200 (CEST) From: David Elsing Date: Sun, 25 Jun 2023 10:03:58 +0000 Message-Id: <2c4fc7cde7f5c6c7ebcc278985286a99e942a386.1687687428.git.david.elsing@posteo.net> In-Reply-To: <7yo7l3x3ll.fsf@posteo.net> References: <7yo7l3x3ll.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 0.15 X-Migadu-Queue-Id: CAD693A8EE X-Spam-Score: 0.15 X-TUID: m+hNLcRzif/u * gnu/packages/potassco.scm: (clingo)[#: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.") -- 2.40.1