From patchwork Sat Jul 27 09:10:54 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: 29555 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 D0D2127BBE9; Sat, 27 Jul 2024 10:12:32 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 21C9427BBE2 for ; Sat, 27 Jul 2024 10:12:32 +0100 (BST) 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 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): Wrap klee-stats. --- gnu/packages/check.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) base-commit: c6ff1d6ff761af0bd9bac5403fd834f04a14a192 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") From patchwork Sat Jul 27 09:10:55 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: 29553 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 A452B27BBEA; Sat, 27 Jul 2024 10:12:16 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 F0DEB27BBE2 for ; Sat, 27 Jul 2024 10:12:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sXdT0-0002Yh-Hc; Sat, 27 Jul 2024 05:11:54 -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-0002Y9-5d 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-000431-TT 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:References:In-Reply-To:Date:From:To:Subject; bh=Z4p4jsTc9sCpWAYyukfwOVFy/CFI1x9cQQPu2IaK6Tc=; b=Fgt46C9eqeqNqQkZ4V0QdYgHQKVOXgFgQJ7wBA4T2IuJ7h23V/tOklrSR/Wy+0xjrf7iW7pMhjpJUmk9vs3aanfZ0iqO029treLDKoGvQ48THRU7Tc6L/S5MBSMPLdXEyFphXDeYwgCKafs7rdLXu45mezGRtrXNNAMspdOLPQu4narKWdsx5ZBCuxyXepRkyrjbuYLTxDVPUx29QTGgGkISndDxF7BJSI9pXZyD2V82eVrrzUT/YPkSGhlBKoS65pi0mz9KNmSDqzZGaYkb5/mZgbU1lvUiJ/gO4hgULG3UUEEsN9OBkj43Egk2DIgfgW1AdjM/Q3x/0oWstu0O+w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sXdT8-0002L5-KP for guix-patches@gnu.org; Sat, 27 Jul 2024 05:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72106] [PATCH v4 2/5] gnu: klee: Enable the test suite. 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.17220715138765 (code B ref 72106); Sat, 27 Jul 2024 09:12:02 +0000 Received: (at 72106) by debbugs.gnu.org; 27 Jul 2024 09:11:53 +0000 Received: from localhost ([127.0.0.1]:40529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdSz-0002Gl-3a for submit@debbugs.gnu.org; Sat, 27 Jul 2024 05:11:53 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:37864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdSu-0002Bq-Sx; Sat, 27 Jul 2024 05:11:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=Z4p4jsTc 9sCpWAYyukfwOVFy/CFI1x9cQQPu2IaK6Tc=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=tkY3j9WrViEc0KeG2L37xd/tyL3 Ma/TclHapXht3WQ0q2RpKsYY3lhLM4kmbJkEXLNZMcKM635vC1yzk45aiedEUViG0nT35q VnFtV+SFNHPVFrAmnFipsyZ0qNRzFibRmb0jPm3mBWfeId4pR+FWmcLiRWMARBLsZe5Exk U4Cg= 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 c07b19d7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sat, 27 Jul 2024 11:11:33 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sat, 27 Jul 2024 11:10:55 +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): Enable all tests. [arguments]: Patch lit configuration and set #:test-target. <#:configure-flags?>: Enable system and unit tests, configure gtest. --- 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 347bd2e1aa..aeaa2e807f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1063,13 +1063,22 @@ (define-public klee (base32 "1nma6dqi8chjb97llsa8mzyskgsg4dx56lm8j514j5wmr8vkafz6")))) (arguments (list + #:test-target "check" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch (lambda _ + ;; Allow specification of an absolute full path to uclibc. (substitute* "CMakeLists.txt" (("\\$\\{KLEE_UCLIBC_PATH\\}/lib/libc\\.a") - "${KLEE_UCLIBC_PATH}")))) + "${KLEE_UCLIBC_PATH}")) + ;; Make sure that we retain the value of the GUIX_PYTHONPATH + ;; environment variable in the test environmented created by + ;; python-lit. Otherwise, the test scripts won't be able to + ;; find the python-tabulate dependency, causing test failures. + (substitute* "test/lit.cfg" + (("addEnv\\('PWD'\\)" env) + (string-append env "\n" "addEnv('GUIX_PYTHONPATH')"))))) (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -1085,7 +1094,13 @@ (define-public klee `("KLEE_RUNTIME_LIBRARY_PATH" = (,(string-append lib "/klee/runtime/")))))))) #:configure-flags - #~(list (string-append "-DLLVMCC=" + #~(list "-DENABLE_UNIT_TESTS=ON" + "-DENABLE_SYSTEM_TESTS=ON" + (string-append "-DGTEST_SRC_DIR=" + #+(package-source googletest)) + (string-append "-DGTEST_INCLUDE_DIR=" + #+(package-source googletest) "/googletest/include") + (string-append "-DLLVMCC=" (search-input-file %build-inputs "/bin/clang")) (string-append "-DLLVMCXX=" (search-input-file %build-inputs "/bin/clang++")) From patchwork Sat Jul 27 09:10:56 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: 29551 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 3E27F27BBEC; Sat, 27 Jul 2024 10:12:07 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 582C627BBE2 for ; Sat, 27 Jul 2024 10:12:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sXdT0-0002ZG-PU; Sat, 27 Jul 2024 05:11:54 -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-0002YO-N1 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 1sXdSz-00043H-EM for guix-patches@gnu.org; Sat, 27 Jul 2024 05:11:53 -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:References:In-Reply-To:Date:From:To:Subject; bh=eMLsc+bTpLPCpRhiXWQ7r5mfI3qcR/g+8MN7acfcW50=; b=tY1Hug2YAc+P2ePuE7HJSCE8Q8dQ3UKHxOzfVv4CwbC6U/Ilj1K9NadOTGQN0P2+HBDDuoch6HX0LbEfggWAp/xoFGJda1XyeFmUElJ0dlvDtIUKD1JjiMaSZztCYMl99plP0LImtjcJP74R9zPtT9zNd7dTM0b2K6LU3p+M0mUwg/v6OvJBkIONg3XY/gdB4vQHkWOsnCM4jIfiS3Z9l44ltMp1/Qwt+d3+2q0On78O2O9kTMk0Ip7sZc+YtJH/utNaWKhKvSB7T9sdEPUPzEodmUz0dWRzftbNVjd7UP/YM4w/HXMWdJYTa68ZktUlYzpw4VLP2ri6I45gfmS3lQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sXdT9-0002M6-4N for guix-patches@gnu.org; Sat, 27 Jul 2024 05:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72106] [PATCH v4 3/5] gnu: klee: Only strip bin directory. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jul 2024 09:12:03 +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.17220715138820 (code B ref 72106); Sat, 27 Jul 2024 09:12:03 +0000 Received: (at 72106) by debbugs.gnu.org; 27 Jul 2024 09:11:53 +0000 Received: from localhost ([127.0.0.1]:40531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdSz-0002H1-Em for submit@debbugs.gnu.org; Sat, 27 Jul 2024 05:11:53 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:37864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdSw-0002Bq-1z; Sat, 27 Jul 2024 05:11:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=eMLsc+bT pLPCpRhiXWQ7r5mfI3qcR/g+8MN7acfcW50=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=ErmDXfTYFOcAbEKUX3aO0mzJ48x M7FZVODxayqU5lENK+27zLOicA3RzDfmHiTHk5H/oCBOsHLDtiXi/zgK/aO+yM+fJBM5Fm 8zzYzK7ihC0C88/WidQWa31YmMA5/eV8bDWO672gzFcGIEGFpYclysfPZQlRONahWRPNt9 okA0= 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 398f2d56 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sat, 27 Jul 2024 11:11:34 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sat, 27 Jul 2024 11:10:56 +0200 Message-ID: <8fe1c17fdbaf83b685d95b5717e84d2f23036660.1722071458.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 This avoid several warnings to be emitted by strip(1) when attempting to strip .bca (i.e. LLVM bitcode) files shipped in /lib/klee/runtime/. * gnu/packages/check.scm (klee): Set #:strip-directories. --- gnu/packages/check.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index aeaa2e807f..250206886f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1063,6 +1063,7 @@ (define-public klee (base32 "1nma6dqi8chjb97llsa8mzyskgsg4dx56lm8j514j5wmr8vkafz6")))) (arguments (list + #:strip-directories #~(list "bin") ;don't strip LLVM bitcode in /lib #:test-target "check" #:phases #~(modify-phases %standard-phases From patchwork Sat Jul 27 09:10:57 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: 29554 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 DA8EA27BBEA; Sat, 27 Jul 2024 10:12:28 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 5DA6A27BBE2 for ; Sat, 27 Jul 2024 10:12:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sXdT2-0002Zh-0j; 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 1sXdT0-0002YZ-5L for guix-patches@gnu.org; Sat, 27 Jul 2024 05:11:54 -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 1sXdSz-00044Z-Sq for guix-patches@gnu.org; Sat, 27 Jul 2024 05:11:53 -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:References:In-Reply-To:Date:From:To:Subject; bh=knLLaUmemiw7yeQqBcHRSsF86ZkeU7397IRG2FdzIL8=; b=UTTOM9jrLAA4GO1YG5jhHF6KHJT9JIAgGcKoapJ06UMDS34B24M/vue1IjpAsno4TSkd9l0Vzc3GiVhUXr/sng51ruQXwTihGni9cFWa4OethflokDiANOfSow8rxarHA/5oGOdGUkS1sZfHzhK7H8kcfZFIf6/lRxqSsN9Sqa7gQ38Q0nOOmkl/BKhzL3KppCZCZS4SeMcERDPkDcy2FA56ZJBe3+/xLcTOZOmkJKXEBUskzGJzfSl/84uRusBgqVh2mG+AqVoF1BbBAE/Sj4k4UNcC19lUEaY2pSkB11conGMM8A9aSzUlPJ6kxilb8j2LvforQuttrBmmccvmPQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sXdT9-0002Ms-JP for guix-patches@gnu.org; Sat, 27 Jul 2024 05:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72106] [PATCH v4 4/5] gnu: klee: Only build on x86_64 Linux. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jul 2024 09:12:03 +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.17220715148876 (code B ref 72106); Sat, 27 Jul 2024 09:12:03 +0000 Received: (at 72106) by debbugs.gnu.org; 27 Jul 2024 09:11:54 +0000 Received: from localhost ([127.0.0.1]:40533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdSz-0002Hu-QH for submit@debbugs.gnu.org; Sat, 27 Jul 2024 05:11:54 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:37864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdSw-0002Bq-Q9; Sat, 27 Jul 2024 05:11:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=knLLaUme miw7yeQqBcHRSsF86ZkeU7397IRG2FdzIL8=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=xGfhdNQcu/iw4P5zNiD3MGEEGS5 hyxAVIKx0HCI15n3XRtWXKoqSZOQVkqcHzd52pcIc6hA4OFrC7M8b8iM1hEdgoCLyy556t kOm1bhR2a0WTuxYwQa1hS1D6XwbSs1qxRZYxHslMhV3HOiQN0Yoz1NHcFkIC/ExibwSRg3 QPIc= 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 d574c409 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sat, 27 Jul 2024 11:11:35 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sat, 27 Jul 2024 11:10:57 +0200 Message-ID: <4a6fe96af9b83df4604fbc485eb080da722c7609.1722071458.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): Add supported-systems. --- gnu/packages/check.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 250206886f..ae3ec90944 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1111,6 +1111,7 @@ (define-public klee (native-inputs (list clang-13 llvm-13 python-lit)) (inputs (list bash-minimal klee-uclibc gperftools sqlite z3 python python-tabulate)) (build-system cmake-build-system) + (supported-systems '("x86_64-linux")) (home-page "https://klee-se.org/") (synopsis "Symbolic execution engine") (description "KLEE is a symbolic virtual machine built on top of the LLVM From patchwork Sat Jul 27 09:10:58 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: 29552 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 47EE927BBE2; Sat, 27 Jul 2024 10:12:08 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 28E4F27BBEA for ; Sat, 27 Jul 2024 10:12:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sXdT3-0002aI-Ta; Sat, 27 Jul 2024 05:11:57 -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 1sXdT0-0002Z3-JF for guix-patches@gnu.org; Sat, 27 Jul 2024 05:11:54 -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 1sXdT0-00046a-AA for guix-patches@gnu.org; Sat, 27 Jul 2024 05:11:54 -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:References:In-Reply-To:Date:From:To:Subject; bh=oaolez0P67Q0SwhWmuOEe0k3MVqEzM29Bro3RuUaiV4=; b=mWcPMg92yTJFvGElmyGavTR2zvBLpJasoOjCf1rG1DWupzb5AyNj6oVbqRDir11aiIevTVTK7yOwnDv2vRooCpVTKQ8MGnj8OMcWUFleHFxgIfBhy96Y62NIh4dZob2oJnEw/MflJ0ISIS3IZ/1Y9kgbBJIhwBfdqXNfZn0MU4sTifTQ6yJRcIihzXMjJrVHg+rEoYvoqr9yvJV8+FEfOXX0ugmRU3BTUAHbniBTVQ8Zj/Lxogs31BWId/mN/rb1on8qDCamqc8fRghTjn0tPBHHcIRSWIXFQDb1txWDSgB2We7sjvphyVRng6bR2VytTg9Y9mvoN5uNj5JV2/4dqA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sXdTA-0002Nd-1d for guix-patches@gnu.org; Sat, 27 Jul 2024 05:12:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72106] [PATCH v4 5/5] gnu: klee-uclibc: Only build on x86_64 Linux. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jul 2024 09:12:04 +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.17220715148927 (code B ref 72106); Sat, 27 Jul 2024 09:12:04 +0000 Received: (at 72106) by debbugs.gnu.org; 27 Jul 2024 09:11:54 +0000 Received: from localhost ([127.0.0.1]:40535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdT0-0002J2-E6 for submit@debbugs.gnu.org; Sat, 27 Jul 2024 05:11:54 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:37864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sXdSx-0002Bq-Ji; Sat, 27 Jul 2024 05:11:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=oaolez0P 67Q0SwhWmuOEe0k3MVqEzM29Bro3RuUaiV4=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=A8jfXXwCW9Y7GBjA/+0yAhgt+Lq M/KXZwTfe9CDR5ibuh1THUn6HPTFjigi+6k1q28X9/Co9R90Pp0JyJf4QCk0CPRZzkKLUF YYAK+Je9p5mMrEEE35h/uLRrGvumxX5H6T6nFgMVCISakIP6qr+vnW345FH3Eij8wRcBIP aKq0= 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 52533eba (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sat, 27 Jul 2024 11:11:36 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sat, 27 Jul 2024 11:10:58 +0200 Message-ID: <219dfd8a2b8f710ccf632c838524a23b77575eca.1722071458.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-uclibc): Add supported-systems. --- gnu/packages/check.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index ae3ec90944..b8fbe3f6a8 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1006,6 +1006,7 @@ (define-public klee-uclibc (sha256 (base32 "12fnr5mq80cxwvv09gi844mi31jgi8067swagxnlxlhxj4mi125j")))) (build-system gnu-build-system) + (supported-systems '("x86_64-linux")) (arguments `(#:tests? #f ;upstream uClibc tests do not work in the fork #:strip-directories '() ;only ships a static library, so don't strip anything.