From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id SP6MBKn+imbPQwEAe85BDQ:P1 (envelope-from ) for ; Sun, 07 Jul 2024 20:46:33 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id SP6MBKn+imbPQwEAe85BDQ (envelope-from ) for ; Sun, 07 Jul 2024 22:46:33 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=soeren-tempel.net header.s=opensmtpd header.b=k5cI4SN8; 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)" header.from=soeren-tempel.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720373244; 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=wI+ZMg1owem/QW5brXlnzj6vm08RALgCe9c1lBdznLc=; b=mUUZQS/2IBVXtS/Gn6pfqe2x2z0VsE28P/FzPYy7crPIjNgnpNov7d2m3n/ro5fqTqECHh 6nr3obELYbDGEXIAavnpsd7ChpH4asKuHZCdoNu2OvbMMkvZatyG6I9J97a0TSPYwKfl9h n7HDlXD/gQQlfsU/kju0NWDkZLGI5CmfQh1vrLQzWTjTjpqLnj6CWkhwcuH8sz3TKzEBLn /wsMgVaHyrdpyWmupA1iW4CW+cC4gpJPn/7mTglpnR6N+qg4Qgf7V8eWr87hnnVCGPIJUj z+PS57NfgBhoTMjQF4CrmgJNuZ3nm070T4YrYzbCA6jqrWzIaildxr4K3/8Kxg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=soeren-tempel.net header.s=opensmtpd header.b=k5cI4SN8; 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)" header.from=soeren-tempel.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720373244; a=rsa-sha256; cv=none; b=CXWsaMFp6VP9f0g79riu2C1dNZPkY+VA4YRB2ivpNNzba2wofB/nUVMur5gLzV+lQ8uh9j K2WskNIv+dhheiEZW9BZy5UKw+UPhfXU6x+sUWjyQQ6wz6pfDECW8NLLBfd8G1p5IJCzct 2CeQ1Sf9RMVLkCt0BbX9q+MGsyGIvqmnFocPev7AjFrDh1YuFlFYKYSzxMAqDCeuO/5C5q tVe3sWThDUkf21wlnraEXYwwsWMC09vSUB5HJJOy4kJdVmyqKsam4DuynzrES2GgM6zSlN C5YmeXNe2SbVMD769ksmykGHJizDZPkKKuDYlPcUWLmafYESpdpSMAmVm6h1Uw== 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 D1CEC6C97D for ; Sun, 7 Jul 2024 19:27:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQVfA-0000P3-UJ; Sun, 07 Jul 2024 13:27:00 -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 1sQVf9-0000OZ-R7 for guix-patches@gnu.org; Sun, 07 Jul 2024 13:26:59 -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 1sQVf9-0006R7-Ib for guix-patches@gnu.org; Sun, 07 Jul 2024 13:26:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQVfC-0005bh-Si for guix-patches@gnu.org; Sun, 07 Jul 2024 13:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71925] [PATCH v2 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: Sun, 07 Jul 2024 17:27: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: liliana.prikler@gmail.com Received: via spool by 71925-submit@debbugs.gnu.org id=B71925.172037321821534 (code B ref 71925); Sun, 07 Jul 2024 17:27:02 +0000 Received: (at 71925) by debbugs.gnu.org; 7 Jul 2024 17:26:58 +0000 Received: from localhost ([127.0.0.1]:49087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQVf7-0005bG-Eq for submit@debbugs.gnu.org; Sun, 07 Jul 2024 13:26:57 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:30794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQVf4-0005aq-Ub; Sun, 07 Jul 2024 13:26:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=wI+ZMg1o wem/QW5brXlnzj6vm08RALgCe9c1lBdznLc=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=k5cI4SN8y06VhP8jkufG00vmYYU R9+XQrC51Hn+zJcJeRqMgvW1gdCioALZSRd8piWNCI3LC99yAk5LHp7qKSqPK9uILcMcbA B/1zG0LVph7W6YtytMZ47/SjvS2ybWNOGZnu4ZJF/SI2qacXbEKWpryR8SbDe1Ex+Ani1S /J6g= Received: from localhost (dynamic-2a02-3102-49da-001b-8090-663c-294a-426c.310.pool.telefonica.de [2a02:3102:49da:1b:8090:663c:294a:426c]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 328ed048 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 7 Jul 2024 19:26:46 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sun, 7 Jul 2024 19:26:31 +0200 Message-ID: <635839070779883196fec8119d70c273f46fc841.1720373191.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <05cf10c887315b7b2ee2a4ee5d43a6baea969d6c.1720373191.git.soeren@soeren-tempel.net> References: <05cf10c887315b7b2ee2a4ee5d43a6baea969d6c.1720373191.git.soeren@soeren-tempel.net> 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-Spam-Score: 3.61 X-Migadu-Queue-Id: D1CEC6C97D X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 3.61 X-TUID: 7CLGWLpaRsvh From: Sören Tempel * gnu/packages/check.scm (klee): Use klee-uclibc. --- gnu/packages/check.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 35e26ba6da..52941681a9 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1036,7 +1036,7 @@ (define-public klee-uclibc (lambda* (#:key outputs #:allow-other-keys) (install-file "lib/libc.a" (string-append (assoc-ref outputs "out") - "/lib"))))))) + "/klee/lib"))))))) ;; ncurses is only needed for the `make menuconfig` interface. (native-inputs (list clang-13 llvm-13 python ncurses)) (synopsis "Variant of uClibc tailored to symbolic execution") @@ -1062,13 +1062,28 @@ (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++")) + (string-append "-DKLEE_UCLIBC_PATH=" + (let ((uclibc (search-input-file %build-inputs "/klee/lib/libc.a"))) + (dirname (dirname uclibc)))) + "-DENABLE_POSIX_RUNTIME=ON"))) (native-inputs (list clang-13 llvm-13 python-lit)) - (inputs (list gperftools sqlite z3)) + (inputs (list bash-minimal klee-uclibc gperftools sqlite z3)) (build-system cmake-build-system) (home-page "https://klee-se.org/") (synopsis "Symbolic execution engine")