From patchwork Sun Jul 14 18:25:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 29307 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 EC88127BBEA; Sun, 14 Jul 2024 19:26:28 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 4E66227BBE2 for ; Sun, 14 Jul 2024 19:26:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sT3v8-0001Gq-A2; Sun, 14 Jul 2024 14:26:02 -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 1sT3v6-0001GJ-KG for guix-patches@gnu.org; Sun, 14 Jul 2024 14:26:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sT3v6-0005y0-B3 for guix-patches@gnu.org; Sun, 14 Jul 2024 14:26:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sT3v7-0005vB-Mv for guix-patches@gnu.org; Sun, 14 Jul 2024 14:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72106] [PATCH v2 1/5] gnu: klee: Wrap klee-stats for Python dependencies. References: In-Reply-To: Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Jul 2024 18:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72106 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72106@debbugs.gnu.org Cc: liliana.prikler@gmail.com Received: via spool by 72106-submit@debbugs.gnu.org id=B72106.172098154022686 (code B ref 72106); Sun, 14 Jul 2024 18:26:01 +0000 Received: (at 72106) by debbugs.gnu.org; 14 Jul 2024 18:25:40 +0000 Received: from localhost ([127.0.0.1]:58553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT3um-0005tq-Ft for submit@debbugs.gnu.org; Sun, 14 Jul 2024 14:25:40 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:38211) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sT3uj-0005ta-M4; Sun, 14 Jul 2024 14:25:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=nur36Ipu yaz95UB5/m4gQD1z7emY/chP5Rzf3nZo1Gc=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=tFrgOPOhhevSCtG4Csa9dPjpcVhEBxwLAjz5KqGwhnapBgM GvZefe5l4RLinXQ/HKOQ+sDdpTXF5OFsWPd98fnDo631bMyIA3JGAHhOJLx255RBTgaZnN 4owUvHw7LrIfsFHXSJDOp5VMYAdiUU9xT8Js9bf3YhJHE1NcVMhViM= Received: from localhost (dynamic-2a02-3102-49da-001b-720e-aee8-aafa-f98d.310.pool.telefonica.de [2a02:3102:49da:1b:720e:aee8:aafa:f98d]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id c85d8bfb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 14 Jul 2024 20:25:32 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sun, 14 Jul 2024 20:25:24 +0200 Message-ID: <3ba31459921293a61ca8933ce7395f4a6d58b559.1720981528.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 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 From: Sören Tempel * gnu/packages/check.scm (klee): Wrap klee-stats. --- gnu/packages/check.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) base-commit: c1d367f57e89c3f2efd964e6d638bd89b0b1df97 diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3bfcf5a37e..6b0ea0aaa8 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1070,7 +1070,15 @@ (define-public klee (substitute* "CMakeLists.txt" (("\\$\\{KLEE_UCLIBC_PATH\\}/lib/libc\\.a") "${KLEE_UCLIBC_PATH}")))) - (add-after 'install 'wrap-hooks + (add-after 'install 'wrap-klee-stats + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (wrap-program (string-append bin "/klee-stats") + `("GUIX_PYTHONPATH" ":" prefix + ,(search-path-as-string->list + (getenv "GUIX_PYTHONPATH"))))))) + (add-after 'install 'wrap-klee (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) @@ -1088,7 +1096,7 @@ (define-public klee (search-input-file %build-inputs "/lib/klee/libc.a")) "-DENABLE_POSIX_RUNTIME=ON"))) (native-inputs (list clang-13 llvm-13 python-lit)) - (inputs (list bash-minimal klee-uclibc gperftools sqlite z3)) + (inputs (list bash-minimal klee-uclibc gperftools sqlite z3 python python-tabulate)) (build-system cmake-build-system) (home-page "https://klee-se.org/") (synopsis "Symbolic execution engine")