From: David Elsing <david.elsing@posteo.net>
To: 64137@debbugs.gnu.org
Cc: David Elsing <david.elsing@posteo.net>
Subject: [bug#64137] [PATCH v2 6/8] gnu: clingo: Unbundle dependencies.
Date: Sun, 18 Jun 2023 20:53:05 +0000 [thread overview]
Message-ID: <e7a43aff1937b06780a52468113ff1020da039cc.1687121561.git.david.elsing@posteo.net> (raw)
In-Reply-To: <7yh6r4ebw2.fsf@posteo.net>
* 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 <liliana.prikler@gmail.com>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2023 David Elsing <david.elsing@posteo.net>
;;;
;;; 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
next prev parent reply other threads:[~2023-06-18 20:54 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-17 19:27 [bug#64137] [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 David Elsing
2023-06-17 19:30 ` [bug#64137] [PATCH 1/2] gnu: catch2-3.1: Rename to catch2-3.3 David Elsing
2023-06-17 19:30 ` [bug#64137] [PATCH 2/2] gnu: Add catch2-static-3.3 David Elsing
2023-06-18 6:55 ` [bug#64137] [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 Liliana Marie Prikler
2023-06-18 20:47 ` David Elsing
2023-06-18 20:53 ` [bug#64137] [PATCH v2 1/8] gnu: Add mpark-variant David Elsing
2023-06-22 4:16 ` Liliana Marie Prikler
2023-06-18 20:53 ` [bug#64137] [PATCH v2 2/8] gnu: Add tsl-hopscotch-map David Elsing
2023-06-22 4:18 ` Liliana Marie Prikler
2023-06-18 20:53 ` [bug#64137] [PATCH v2 3/8] gnu: Add tsl-sparse-map David Elsing
2023-06-18 20:53 ` [bug#64137] [PATCH v2 4/8] gnu: Add tsl-ordered-map David Elsing
2023-06-18 20:53 ` [bug#64137] [PATCH v2 5/8] gnu: Add tl-optional David Elsing
2023-06-18 20:53 ` David Elsing [this message]
2023-06-22 4:19 ` [bug#64137] [PATCH v2 6/8] gnu: clingo: Unbundle dependencies Liliana Marie Prikler
2023-06-18 20:53 ` [bug#64137] [PATCH v2 7/8] gnu: catch2-3.1: Rename to catch2-3.3 David Elsing
2023-06-22 4:20 ` Liliana Marie Prikler
2023-06-18 20:53 ` [bug#64137] [PATCH v2 8/8] gnu: Add catch2-static-3.3 David Elsing
2023-06-22 4:24 ` Liliana Marie Prikler
2023-06-25 10:01 ` [bug#64137] [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 David Elsing
2023-06-25 10:03 ` [bug#64137] [PATCH v3 1/7] gnu: Add mpark-variant David Elsing
2023-06-25 10:03 ` [bug#64137] [PATCH v3 2/7] gnu: Add tsl-hopscotch-map David Elsing
2023-06-25 10:03 ` [bug#64137] [PATCH v3 3/7] gnu: Add tsl-sparse-map David Elsing
2023-06-25 10:03 ` [bug#64137] [PATCH v3 4/7] gnu: Add tsl-ordered-map David Elsing
2023-06-25 10:03 ` [bug#64137] [PATCH v3 5/7] gnu: Add tl-optional David Elsing
2023-06-25 10:03 ` [bug#64137] [PATCH v3 6/7] gnu: clingo: Unbundle dependencies David Elsing
2023-06-25 10:03 ` [bug#64137] [PATCH v3 7/7] gnu: catch2-3.1: Rename to catch2-3.3 and update to 3.3.2 David Elsing
2023-06-25 16:06 ` [bug#64137] [PATCH 0/2] Build catch2@3 with CMake " Liliana Marie Prikler
[not found] ` <7ycz1f350w.fsf@posteo.net>
2023-06-28 16:51 ` [bug#64137] [PATCH v4] gnu: catch2-3.1: Rename to catch2-3.3 " David Elsing
2023-07-01 10:41 ` bug#64137: [PATCH 0/2] Build catch2@3 with CMake " Liliana Marie Prikler
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=e7a43aff1937b06780a52468113ff1020da039cc.1687121561.git.david.elsing@posteo.net \
--to=david.elsing@posteo.net \
--cc=64137@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.