From patchwork Wed Jul 3 19:09:43 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: 65889 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 7BAAB27BBEA; Wed, 3 Jul 2024 20:11:05 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 E7EA827BBE2 for ; Wed, 3 Jul 2024 20:11:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP5Ne-0005OC-00; Wed, 03 Jul 2024 15:11: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 1sP5Nc-0005Nz-Fc for guix-patches@gnu.org; Wed, 03 Jul 2024 15:11: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 1sP5Nc-0007Ml-7F for guix-patches@gnu.org; Wed, 03 Jul 2024 15:11:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sP5Ne-000262-38 for guix-patches@gnu.org; Wed, 03 Jul 2024 15:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71925] [PATCH 2/2] gnu: klee: Build with klee-uclibc support. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Jul 2024 19:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71925 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71925@debbugs.gnu.org Cc: julien@lepiller.eu, liliana.prikler@gmail.com Received: via spool by 71925-submit@debbugs.gnu.org id=B71925.17200338077975 (code B ref 71925); Wed, 03 Jul 2024 19:11:02 +0000 Received: (at 71925) by debbugs.gnu.org; 3 Jul 2024 19:10:07 +0000 Received: from localhost ([127.0.0.1]:40479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP5Mk-00024Z-WB for submit@debbugs.gnu.org; Wed, 03 Jul 2024 15:10:07 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:25154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP5Mi-000248-QG; Wed, 03 Jul 2024 15:10:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=vfqaNJpw Xho82eiI6925UKTltucqaKoFaTfGceXL3Fs=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=NoqN3uha+BbH5Ls8CP9ieCY7FC+ zHqZRBidWJ4PNhNfXdvslFQEJARWCpWsdB5uCVXycoPCKy29VldQr6jR4USM4dSMIQ5MU+ lmDlho0uw4IP7w3X0A2AegTHr28ctZvq4qFv5Yt+TBQX1qRAgkdUfNKi0i9Amch3d40PdZ joDw= Received: from localhost (dynamic-2a02-3102-49da-001b-62dc-fa7d-6197-0275.310.pool.telefonica.de [2a02:3102:49da:1b:62dc:fa7d:6197:275]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id dc8e40bf (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 3 Jul 2024 21:10:01 +0200 (CEST) From: soeren@soeren-tempel.net Date: Wed, 3 Jul 2024 21:09:43 +0200 Message-ID: <50e13182dab9f13a90c63a670a286eb447133e44.1720033365.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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): Use klee-uclibc. --- gnu/packages/check.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 35e26ba6da..ad589f6e15 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1062,13 +1062,26 @@ (define-public klee (base32 "1nma6dqi8chjb97llsa8mzyskgsg4dx56lm8j514j5wmr8vkafz6")))) (arguments (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-hooks + (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). + (wrap-program (string-append bin "/klee") + `("KLEE_RUNTIME_LIBRARY_PATH" ":" = + (,(string-append lib "/klee/runtime/")))))))) #:configure-flags #~(list (string-append "-DLLVMCC=" (search-input-file %build-inputs "/bin/clang")) (string-append "-DLLVMCXX=" - (search-input-file %build-inputs "/bin/clang++"))))) + (search-input-file %build-inputs "/bin/clang++")) + "-DENABLE_POSIX_RUNTIME=ON" + (string-append "-DKLEE_UCLIBC_PATH=" #$klee-uclibc)))) (native-inputs (list clang-13 llvm-13 python-lit)) - (inputs (list gperftools sqlite z3)) + (inputs (list bash-minimal gperftools sqlite z3)) (build-system cmake-build-system) (home-page "https://klee-se.org/") (synopsis "Symbolic execution engine")