From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id mAWmDEaZi2bggAEA62LTzQ:P1 (envelope-from ) for ; Mon, 08 Jul 2024 07:46:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id mAWmDEaZi2bggAEA62LTzQ (envelope-from ) for ; Mon, 08 Jul 2024 09:46:14 +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=W+Wz5uC0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=soeren-tempel.net (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720424774; 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=cewgpRNE1wVtGzJesSiujlEKHB+U7J4L4Pln3Qzaf4w=; b=i58azNhxbIeoyPXGy6a8TIkbCQVUEp2tKloU80K+MdnIMLUsTe/7ZpeZHbzbbGBJ4pluFD k8DN0a2QxdYLfsfOoZZZ5ctWu2u307WTvbVg64CC3wipw92ofOkRFEbCQJyx2Cds5QwrS6 7yHo2lRJnTvUmuHWAbRvcs6DMx8ICQvV7jsISD9XqwPFMW7N+eoyf+yYAEa3r0D/q3Qh/B WBx8Iw7b5VR9Drkon+3vgNodpesWXKRxd0De6b1EHg3tdWfIqcwrBzTDnmBuZWMSDkDfnH E5J/iuZHYzxVjOgCxq8lrZtTtQmVrAVD66EyE6VXJg/GtLrkvoMCqsVFmJIj6Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720424774; a=rsa-sha256; cv=none; b=Cod82zSxrFTSASk2aF2+cueMqn7fu2LlZ6mJLfyBy0QyRoSf62eemxvBZC5lZSTr3ngAo4 BsknPSViowcbLCpL2KiCpQN5V/ixKGenlDr3CJVHdJGP7LqOAJyoRVWWHzjRfv87pVIbbS iPqkKb2A5jW8cFcy0IXzCOIgPD2BTXRZgnG14Qp7J+lsxjY40Z8AdoDTMRgYf+TQCfNpQb QB9q3dWQ7Hb2rgJCrIhtZ62gJRtdLQQjDB5il5q7rubd3ls4RAg6BGs15e4c2TzHFf+bI/ uiexSpd2HzYeCWimDGlNnTSrpO+ljSgyprFZ0ulOdnseMPhV4SQVAj8b5sJiMA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=soeren-tempel.net header.s=opensmtpd header.b=W+Wz5uC0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=soeren-tempel.net (policy=none); 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" 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 1030520F3F for ; Mon, 8 Jul 2024 09:46:14 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQj4V-0007E6-FQ; Mon, 08 Jul 2024 03:46:04 -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 1sQj4P-0007DU-RX for guix-patches@gnu.org; Mon, 08 Jul 2024 03:45:58 -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 1sQj4P-0003Xw-JL for guix-patches@gnu.org; Mon, 08 Jul 2024 03:45:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQj4U-00065n-9Y for guix-patches@gnu.org; Mon, 08 Jul 2024 03:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71925] [PATCH v4 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: Mon, 08 Jul 2024 07:46: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.172042473423373 (code B ref 71925); Mon, 08 Jul 2024 07:46:02 +0000 Received: (at 71925) by debbugs.gnu.org; 8 Jul 2024 07:45:34 +0000 Received: from localhost ([127.0.0.1]:49584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQj3p-00064j-4y for submit@debbugs.gnu.org; Mon, 08 Jul 2024 03:45:33 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:41054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQj3l-00064K-Ox; Mon, 08 Jul 2024 03:45:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=cewgpRNE 1wVtGzJesSiujlEKHB+U7J4L4Pln3Qzaf4w=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=W+Wz5uC0QqarvE3eMZsylfjKuID xI9H2Wn3xWf5fXoYaC4TkSf4mNn+pexUNieGrH4WJdGGCAZvaX49/3KrxEEguqks8Ain3U 4jfJ04V3cCYq6XY/m0kxJPZf19umk+2Byy8h5Y2HubFi83fmn6u8Y5reaAtI5A6eIiZG9J eh/Q= Received: from localhost (dynamic-2a02-3102-49da-001b-167b-bb16-88d3-7747.310.pool.telefonica.de [2a02:3102:49da:1b:167b:bb16:88d3:7747]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 1ba0258a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Mon, 8 Jul 2024 09:45:07 +0200 (CEST) From: soeren@soeren-tempel.net Date: Mon, 8 Jul 2024 09:44:26 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 1030520F3F X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -4.29 X-Spam-Score: -4.29 X-TUID: meyXG4N8ny7J From: Sören Tempel * gnu/packages/check.scm (klee): Use klee-uclibc. --- Changes since v3: Move klee-uclibc library to `/lib/klee/libc.a`. gnu/packages/check.scm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e02dc1b23d..c4eaaef18f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1062,13 +1062,32 @@ (define-public klee (base32 "1nma6dqi8chjb97llsa8mzyskgsg4dx56lm8j514j5wmr8vkafz6")))) (arguments (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "CMakeLists.txt" + (("\\$\\{KLEE_UCLIBC_PATH\\}/lib/libc\\.a") + "${KLEE_UCLIBC_PATH}")))) + (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=" + (search-input-file %build-inputs "/lib/klee/libc.a")) + "-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")