From patchwork Sun Jul 7 19:19:07 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: 65989 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 8EE4A27BBE9; Sun, 7 Jul 2024 20:20:23 +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=unavailable 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 D6FF327BBE2 for ; Sun, 7 Jul 2024 20:20:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQXQV-0007CP-0c; Sun, 07 Jul 2024 15:19:59 -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 1sQXQT-0007Bz-OO for guix-patches@gnu.org; Sun, 07 Jul 2024 15:19:57 -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 1sQXQT-0006pb-G9 for guix-patches@gnu.org; Sun, 07 Jul 2024 15:19:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQXQX-00036M-SP for guix-patches@gnu.org; Sun, 07 Jul 2024 15:20:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71925] [PATCH v3 1/2] gnu: Add klee-uclibc. References: In-Reply-To: Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2024 19:20:01 +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.172037996211836 (code B ref 71925); Sun, 07 Jul 2024 19:20:01 +0000 Received: (at 71925) by debbugs.gnu.org; 7 Jul 2024 19:19:22 +0000 Received: from localhost ([127.0.0.1]:49209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQXPt-00034p-Qt for submit@debbugs.gnu.org; Sun, 07 Jul 2024 15:19:22 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:9969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQXPr-00034f-FV; Sun, 07 Jul 2024 15:19:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=DX/Ob3zp tWDyjCXFE0FIfDAYR6byOIf+cjyBvoArgrg=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=CEbgTQAhS8iKYYjfWbAoOYzVtNXjpiU0NEWbhMLOIhX1ufG EhsTeQx7FgO8lQR/AhNtBV0T02rB8qX9j1V7Zrpn3mbwn4bLO9ayGP/hD2dXUyU2d6mE66 EnCnlI5tFf1zbsOnNv6Wfe2wJllXAxXicHpWHOJjJpOiyBZRYRbQUw= 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 e477c2b0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 7 Jul 2024 21:19:14 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sun, 7 Jul 2024 21:19:07 +0200 Message-ID: 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-uclibc): New variable. --- gnu/packages/check.scm | 58 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) base-commit: bab73e413b3421f4aa051e9438d147040a52e1be diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 550a5d0f1d..c4bae49165 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -87,6 +87,7 @@ (define-module (gnu packages check) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages maths) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -989,6 +990,63 @@ (define-public greatest runner. It is quite unopinionated with most of its features being optional.") (license license:isc))) +(define-public klee-uclibc + (let ((commit "955d502cc1f0688e82348304b053ad787056c754")) + (package + (name "klee-uclibc") + (version (git-version "20230612" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee-uclibc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12fnr5mq80cxwvv09gi844mi31jgi8067swagxnlxlhxj4mi125j")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;upstream uClibc tests do not work in the fork + #:strip-directories '() ;only ships a static library, so don't strip anything. + #:phases (modify-phases %standard-phases + ;; Disable locales as these would have to be downloaded and + ;; shouldn't really be needed for symbolic execution either. + (add-after 'unpack 'patch-config + (lambda _ + (substitute* "klee-premade-configs/x86_64/config" + (("UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_HAS_LOCALE=y") + "UCLIBC_HAS_LOCALE=n") + (("UCLIBC_HAS_XLOCALE=y") + "UCLIBC_HAS_XLOCALE=n")))) + + ;; Upstream uses a custom non-GNU configure script written + ;; in Python, replace the default configure phase accordingly. + (replace 'configure + (lambda _ + (invoke "./configure" "--make-llvm-lib" + "--enable-release"))) + + ;; Custom install phase to only install the libc.a file manually. + ;; This is the only file which is used/needed by KLEE itself. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "lib/libc.a" + (string-append (assoc-ref outputs "out") + "/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") + (description + "Modified version of uClibc for symbolic execution of +Unix userland software. This library can only be used in conjunction +with the @code{klee} package.") + (home-page "https://klee-se.org/") + (license license:lgpl2.1)))) + (define-public klee (package (name "klee") From patchwork Sun Jul 7 19:19:08 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: 65990 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 1A88B27BBE9; Sun, 7 Jul 2024 20:20:36 +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=unavailable 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 701D827BBE2 for ; Sun, 7 Jul 2024 20:20:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQXQV-0007CW-3b; Sun, 07 Jul 2024 15:19:59 -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 1sQXQU-0007C8-6M for guix-patches@gnu.org; Sun, 07 Jul 2024 15:19: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 1sQXQT-0006ph-UN for guix-patches@gnu.org; Sun, 07 Jul 2024 15:19:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQXQY-00036V-9r for guix-patches@gnu.org; Sun, 07 Jul 2024 15:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71925] [PATCH v3 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 19:20: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.172037996511852 (code B ref 71925); Sun, 07 Jul 2024 19:20:02 +0000 Received: (at 71925) by debbugs.gnu.org; 7 Jul 2024 19:19:25 +0000 Received: from localhost ([127.0.0.1]:49211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQXPx-000356-CL for submit@debbugs.gnu.org; Sun, 07 Jul 2024 15:19:25 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:9969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQXPs-00034f-QD; Sun, 07 Jul 2024 15:19:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=WN7Dq+tI QPrHm4RSyT+O5Lmuq7U6x/NTjvJ4MH5HOfI=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=PO3OEBqzjWn23jzZaw4MZac8Zgt rlBXWhc8lEOo4/+GihUYWmvipUBva83Tgn/RcEWgr53y9k56pBcRBfhYRT1kb8piuF+7TS fwV5T0cGKbR7pXRgT5qxEeNIdJLRDZFlnojFw/dbxNWMk6gYTPkifBuSJMFP8VP0bDb2R9 cH6Q= 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 2d8caf79 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 7 Jul 2024 21:19:15 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sun, 7 Jul 2024 21:19:08 +0200 Message-ID: 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 | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c4bae49165..52941681a9 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -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")