From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id qJIcNQC6pGaq4gAAqHPOHw:P1 (envelope-from ) for ; Sat, 27 Jul 2024 09:12:34 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id qJIcNQC6pGaq4gAAqHPOHw (envelope-from ) for ; Sat, 27 Jul 2024 11:12:32 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="WMyRMi6/"; dkim=fail ("headers rsa verify failed") header.d=soeren-tempel.net header.s=opensmtpd header.b=HQkT7MfJ; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=soeren-tempel.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1722071552; 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=M+KKNM2Pgid9S74B6vaAX7yMEiSIVz3PFrASLrPAVqM=; b=Uqi8ZbDmPC9Ej0Xbqgfniq/CQJJ1pWfNFRxqzRg2Xj1hk98oNk5RBm93dczr7P3UELauaX 19uO7wgXWoeWXTlKPdeu7w3KJFc4LUIIDNYUS3CyAGzwGm7Kg6H6M05FeIZU2jJhm2JQWt mlMHUzVF/n3hjmD6Jqqw5+hwW+15uGse6OFQmV5vUhExQPWtTru3OdDlJtTNrDcu58CUWZ 3vT4NqnIBAVsC7QfRx/R+QXyksJV7wni5t9qRwGQGEc8jOOHcCcLIzZyyPiG+YpXapxkJn Tlh16eCV8LCFzyKa8HbuyH8HW0eoEVedVx7q0Kkq/RQeJSAUa+OYvcgez6hnww== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="WMyRMi6/"; dkim=fail ("headers rsa verify failed") header.d=soeren-tempel.net header.s=opensmtpd header.b=HQkT7MfJ; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=soeren-tempel.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722071552; a=rsa-sha256; cv=none; b=Rtji/G/fXcY8D9LhF+1fWzw0oLphFkCFPHVwV+l/xShBoui6jbFlx2piuqa4zWwkDnUzPM CHJVMC+q6She6Wa1NCttbUmT/6LcIgTviUFjUdskxqs3oW0oXOgqBuwylAfLNFixybKCI3 VGVlmmoVmK5kp7HsJaxN2DYYd4OMHSY0+unTRqAl6dwXCzXymuxs0fAsczH6KafUl/3TXJ HMt2WTtN5buT8wbr0lSn8h5tPYD1GrnPz42t/0i7gNTIV0BxFqRtsedWtDbZx7OaDczKdV WKQl4kRKDp8C10sBCV/zS6L3R1d+P5QgYzYMq8eyGbzvzP/8Z7+IW6XNqHKB1A== 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 C7BAD525A7 for ; Sat, 27 Jul 2024 11:12:32 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sXdT2-0002Zj-6M; Sat, 27 Jul 2024 05:11:56 -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 1sXdSz-0002Y8-4l for guix-patches@gnu.org; Sat, 27 Jul 2024 05:11:53 -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 1sXdSy-00041F-Rn for guix-patches@gnu.org; Sat, 27 Jul 2024 05:11:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=M+KKNM2Pgid9S74B6vaAX7yMEiSIVz3PFrASLrPAVqM=; b=WMyRMi6/B7TZQDPcwS1TjAZaef06XYBdkk4xmss55a5AKm0Vu00zM40RbyBhn8oouBaQZKnQvpe1Qr/6F8G/0uGw/RzJd+Uiv9iwbyRNwLpZ7FoxsSzGK6CsXns65ol2d327KIV1cMJEGDUVP3rQFK5f/JJBbz/SoVOojgD2IGmZx1Iekq9y5Mz5Vl8ffdbuLECycT7zpqEKR1xmAXBOYqRNVoaw9w8PeKdm+JYmCyhXjXaOjM/cpOWElP12oI9vR0bnRbSHrsXGdexUI0/+nTJOMpMKmFnXSzOSzv5JFXpCNHt/ONQ8I/jKnLgq8gjV+qRvZv/8/xnmyfSHkbgtwQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sXdT8-0002Ka-3e for guix-patches@gnu.org; Sat, 27 Jul 2024 05:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72106] [PATCH v4 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: Sat, 27 Jul 2024 09:12:02 +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.17220715108558 (code B ref 72106); Sat, 27 Jul 2024 09:12:02 +0000 Received: (at 72106) by debbugs.gnu.org; 27 Jul 2024 09:11:50 +0000 Received: from localhost ([127.0.0.1]:40524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdSv-0002Ct-Gv for submit@debbugs.gnu.org; Sat, 27 Jul 2024 05:11:50 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:37864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdSs-0002Bq-Su; Sat, 27 Jul 2024 05:11:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=M+KKNM2P gid9S74B6vaAX7yMEiSIVz3PFrASLrPAVqM=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=HQkT7MfJh2U9Aq1Es1gL8+hQ1zE6D6yLr2QTKyf2jNz6I68 J5KMP8ox5VBJ4aGgqOoyNoZrH416HphpkTcyO/Zd36+qXTN/3Dr+g1NhwhvI4t7ycL0asR 5mKjpcaXl4ohHBYzcn3f0UULNaa+dcpmWr2eRP0T8wXopzWhlUBn4g= Received: from localhost (dynamic-176-005-148-021.176.5.pool.telefonica.de [176.5.148.21]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id c750bbef (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sat, 27 Jul 2024 11:11:32 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sat, 27 Jul 2024 11:10:54 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 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-Queue-Id: C7BAD525A7 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -9.36 X-Spam-Score: -9.36 X-TUID: MW5ebizLUPZQ From: Sören Tempel * gnu/packages/check.scm (klee): Wrap klee-stats. --- gnu/packages/check.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 412b94569c..347bd2e1aa 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1070,12 +1070,17 @@ (define-public klee (substitute* "CMakeLists.txt" (("\\$\\{KLEE_UCLIBC_PATH\\}/lib/libc\\.a") "${KLEE_UCLIBC_PATH}")))) - (add-after 'install 'wrap-hooks + (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (lib (string-append out "/lib"))) - ;; Ensure that KLEE finds runtime libraries (e.g. uclibc). + ;; Ensure that klee-stats finds its Python dependencies. + (wrap-program (string-append bin "/klee-stats") + `("GUIX_PYTHONPATH" ":" prefix + ,(search-path-as-string->list + (getenv "GUIX_PYTHONPATH")))) + ;; Ensure that klee finds runtime libraries (e.g. uclibc). (wrap-program (string-append bin "/klee") `("KLEE_RUNTIME_LIBRARY_PATH" = (,(string-append lib "/klee/runtime/")))))))) @@ -1088,7 +1093,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") base-commit: c6ff1d6ff761af0bd9bac5403fd834f04a14a192