From patchwork Thu Dec 8 08:47:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 45120 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 9AB9C27BBEB; Thu, 8 Dec 2022 10:14:57 +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=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 9747327BBE9 for ; Thu, 8 Dec 2022 10:14:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3Dup-0004x8-He; 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-0004vR-Ty 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-0000o4-Rb 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-0008FR-Mu for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59896] [PATCH 3/5] gnu: clingo: Use G-Expressions. 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.167049442231661 (code B ref 59896); Thu, 08 Dec 2022 10:14:02 +0000 Received: (at 59896) by debbugs.gnu.org; 8 Dec 2022 10:13:42 +0000 Received: from localhost ([127.0.0.1]:55801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuP-0008Ea-Bk for submit@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:41 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:40763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuL-0008Dy-K4 for 59896@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:38 -0500 Received: by mail-ej1-f66.google.com with SMTP id b2so2702203eja.7 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=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=4W66XryIEdzAYbrbLaPpgIqFooqgsQW1nGZ5orHL1OQ=; b=k6QA1jDT6FvKAaOwMskHoIzBI0WroIzAT3RpLGW5n+qT2U4NiDvZOgCn9GxVrHGsoS oZTE3VvQMNdyyNg17omgBe49Ws3Hdr9WVUYrfdEI6qeZX6j9m6B8AWK74MpGFQh+6m/N SFGrH0LmTY1Q743hKwPJBpuEUAcz2N01Yn6Vj06xWExyiOnDX3pNjTnAbSLPrPACEFhw bveQwtTMy8NGfqWjb448HTx0xl98FL1aY3dc7RQWoxmfUlz/R/RKqI85cXI0NTz90cXN 4qIrQmr/ecJL7e4ZEQMWxypCv87qHEst1UD5K7uN9SHNN7W43xZ32nowVGWjSkTtwezj 5PpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4W66XryIEdzAYbrbLaPpgIqFooqgsQW1nGZ5orHL1OQ=; b=awYUi6aTLhsg1JX8qjUEzNZWNwzS1vVJXW8iJMfHpk72bbVveAcBUA77kZaQdOuevS +vqn3isoVUQf0Gf3czVsPGPJbjNAW14bx0CK6PmdPRso9T+58XN9IPFE+aDRwX9MxBTC orUzJXecQapnwiBciYKKtV14d6tLEmFPPmGapBpGABgrglxYGmNi0bXDP/db3cbkNLS0 cWgCs+rroPNjYreU0ws+amhYXMcG6PTJHEInOUGGo7JSMYE0rcdKfQ7667gMOzCgXZRp 1mBnZrUTrl7umRszP8f8ZdzCeKDnYj0lnpL8koa0y2xbt5lzZX7TwnfHKqPELm2qkfwJ Zm4w== X-Gm-Message-State: ANoB5pk9GxE+xf8pmclh1Ov/GgDcqEljF5NgQJQYJd9ZDFAOnMtE4p3N 1J/dL8t4p79yAZx5iXCRkrhhzcseSkY= X-Google-Smtp-Source: AA0mqf725xUOWUtWcG5GHX02TenWE08ScbFJMyYz7JxFWJQZNNouRyHt03ScF0Wlxd5tAFinDm4ZMA== X-Received: by 2002:a17:906:3ad8:b0:7a8:dddc:7ec6 with SMTP id z24-20020a1709063ad800b007a8dddc7ec6mr29001750ejd.734.1670494412004; Thu, 08 Dec 2022 02:13:32 -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.31 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:47:52 +0100 Message-ID: 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/maths.scm (clingo)[arguments]: Convert to list of G-Expressions. --- gnu/packages/maths.scm | 75 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6a55284308..2215be9dad 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2643,43 +2643,44 @@ (define-public clingo "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" - "-DCLINGO_USE_LOCAL_CLASP=off" - "-DCLINGO_USE_LOCAL_CATCH=off") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cmake - (lambda _ - (substitute* "CMakeLists.txt" - (("add_subdirectory\\(clasp\\)") - "find_package(clasp REQUIRED)")) - (substitute* "libclingo/CMakeLists.txt" - (("\"cmake/Clingo\"") "\"cmake/clingo\"") - (("ClingoConfig\\.cmake") "clingo-config.cmake") - (("ClingoConfigVersion\\.cmake") - "clingo-config-version.cmake")) - (substitute* "cmake/ClingoConfig.cmake.in" - (("find_package\\(Clasp") "find_package(clasp")) - (rename-file "cmake/ClingoConfig.cmake.in" - "cmake/clingo-config.cmake.in"))) - (add-after 'unpack 'skip-failing-tests - (lambda _ - (with-directory-excursion "libclingo/tests" - (substitute* "CMakeLists.txt" - (("COMMAND test_clingo" all) - (string-append all - " -f " - "\"${CMAKE_CURRENT_SOURCE_DIR}/good.txt\""))) - (call-with-output-file "good.txt" - (lambda (port) - (for-each (lambda (test) (format port "~s~%" test)) - '("parse-ast-v2" "add-ast-v2" "build-ast-v2" - "unpool-ast-v2" "parse_term" - "propagator" "propgator-sequence-mining" - "symbol" "visitor")))))))))) + (list + #:configure-flags #~`("-DCLINGO_BUILD_TESTS=on" + "-DCLINGO_INSTALL_LIB=on" + "-DCLINGO_BUILD_STATIC=off" + "-DCLINGO_BUILD_SHARED=on" + "-DCLINGO_USE_LOCAL_CLASP=off" + "-DCLINGO_USE_LOCAL_CATCH=off") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(clasp\\)") + "find_package(clasp REQUIRED)")) + (substitute* "libclingo/CMakeLists.txt" + (("\"cmake/Clingo\"") "\"cmake/clingo\"") + (("ClingoConfig\\.cmake") "clingo-config.cmake") + (("ClingoConfigVersion\\.cmake") + "clingo-config-version.cmake")) + (substitute* "cmake/ClingoConfig.cmake.in" + (("find_package\\(Clasp") "find_package(clasp")) + (rename-file "cmake/ClingoConfig.cmake.in" + "cmake/clingo-config.cmake.in"))) + (add-after 'unpack 'skip-failing-tests + (lambda _ + (with-directory-excursion "libclingo/tests" + (substitute* "CMakeLists.txt" + (("COMMAND test_clingo" all) + (string-append all + " -f " + "\"${CMAKE_CURRENT_SOURCE_DIR}/good.txt\""))) + (call-with-output-file "good.txt" + (lambda (port) + (for-each (lambda (test) (format port "~s~%" test)) + '("parse-ast-v2" "add-ast-v2" "build-ast-v2" + "unpool-ast-v2" "parse_term" + "propagator" "propgator-sequence-mining" + "symbol" "visitor")))))))))) (inputs (list catch2-3.1 clasp libpotassco)) (native-inputs (list pkg-config)) (home-page "https://potassco.org/")