From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id gF42BO/VrmL/RAEAbAwnHQ (envelope-from ) for ; Sun, 19 Jun 2022 09:53:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EPlCBO/VrmLPYwAA9RJhRA (envelope-from ) for ; Sun, 19 Jun 2022 09:53:19 +0200 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 7555E2CE16 for ; Sun, 19 Jun 2022 09:53:18 +0200 (CEST) Received: from localhost ([::1]:58460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2pkD-0006ef-1J for larch@yhetil.org; Sun, 19 Jun 2022 03:53:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2pjz-0006eM-Ft for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2pjz-00010L-8b for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2pjz-0002uN-7Y for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56080] [PATCH 4/4] gnu: bap: Update to 2.5.0-alpha. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Jun 2022 07:53:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56080 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56080@debbugs.gnu.org Received: via spool by 56080-submit@debbugs.gnu.org id=B56080.165562513211099 (code B ref 56080); Sun, 19 Jun 2022 07:53:03 +0000 Received: (at 56080) by debbugs.gnu.org; 19 Jun 2022 07:52:12 +0000 Received: from localhost ([127.0.0.1]:50554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2pjA-0002sw-0K for submit@debbugs.gnu.org; Sun, 19 Jun 2022 03:52:12 -0400 Received: from lepiller.eu ([89.234.186.109]:40982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2pj4-0002sF-Iu for 56080@debbugs.gnu.org; Sun, 19 Jun 2022 03:52:07 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 353c00d2 for <56080@debbugs.gnu.org>; Sun, 19 Jun 2022 07:52:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=mTDJDPSzuekvtLGNWkMRcQkD2 rSVKADdH3Eb5LO58Uc=; b=HPTEh+2U0D5MJ1iGOB4oV+26k/DuRMEV8IzGDRXA3 uRDVr/0uQUb6F0IPQ++qszH4oEQ/SRpYWciz1qdyDGZu/T4SHB2twppd680Ks9K3 /1NV6C339BNC4pM5Qr1qWtfm6jVs2fX9OFxVq67rIiFi86r8s69xKym+tL+Re9YM GGIrlzdro4yiIzO0j0h5Y2BGumpqE4xHhWmHFlIwQS39xTwLq3OP3hoTGnL+T/Yt i9Ey424bvXj0Z5uKjiuiltZ3m/PeUkFLUaZWR+fLbxU5orNm4B6JCf/46+kbgoEj yiHDiStz2MoyaUt0vuSzL5WyAckuTtW6F1LnQZ25Lr0iQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b1d94805 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <56080@debbugs.gnu.org>; Sun, 19 Jun 2022 07:52:00 +0000 (UTC) From: Julien Lepiller Date: Sun, 19 Jun 2022 09:51:50 +0200 Message-Id: <20220619075150.10754-4-julien@lepiller.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220619075150.10754-1-julien@lepiller.eu> References: <20220619075150.10754-1-julien@lepiller.eu> MIME-Version: 1.0 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655625198; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: 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=Gfy0XA6B5KpGB0gJ5WWHYtndqD+E+gUfUts8iPWbNME=; b=rgtzFVCdXKoKG5aVTrUgGJTbzW+yqchVR80G9q4komn3KF9qPsJfbnFAyiJpYIVlj2BrS2 u9URXCOOPzVtSroTWGeborZTcXkg6Cr0cNxm2JGOTjGqK6VRQ797ZNELVjoD5EyVT5TgGP KMoiT2m23Y2yYsZr4GRHtYWTnfP3tFsFLwGViNi2YwoSlTjw7HivrswyOhwqU7NYi1K27l J0/uTFoSLmOkRt7XEB2vwT9VzKRA59CObmjTf35X+igAZzxlpsmTV5h3nHtZbJ++pRvxE6 sn3/PxIecH+XUgSOop9Bp1u98RzhtQ4O6N1a35cHX0qrKkfMnJ2iX72DS3/3pA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655625198; a=rsa-sha256; cv=none; b=u0OjdcweaWxzU+kQIUeRyknx4RWar3wF774Pxz2OHxPJKY/FRYjQR3QxZgXXJDcR6+wdWB 1atx5SuqHLB9+ZA2uI+5zpvBJqDbDDhNDuNjq3lea9nho+9uh+Zr8HRw/Vjvig1PIH/XYV au733KK9A8KjS7fQp0+oz4bc057UmhS9sRzXlX7YRh4OMAMR8didoWCvLoegYLC/FcMCaE xuCEIBreZ+Bu33ak8Gbr8I2obvzy6zjhl/6GLLNk+2uQfYUO81Qym1pezaMCtidAHrb2On hUHKpLQc8cyZ6WY1FmtNpnZLaUgXidCSdR0iIcjiQlKHLzYggAJwq1BdnWlsAQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=HPTEh+2U; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (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" X-Migadu-Spam-Score: 9.01 X-Spam: Yes Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=HPTEh+2U; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (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" X-Migadu-Queue-Id: 7555E2CE16 X-Spam-Score: 9.01 X-Migadu-Spam: Yes X-Migadu-Scanner: scn0.migadu.com X-TUID: zRBFYFag7bsX * gnu/packages/ocaml.scm (bap): Update to 2.5.0-alpha. --- gnu/packages/ocaml.scm | 104 ++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 49 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 59a883b400..06fee0ed59 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4074,7 +4074,7 @@ (define-public ocaml-ppx-bap (define-public bap (package (name "bap") - (version "2.0.0") + (version "2.5.0-alpha") (home-page "https://github.com/BinaryAnalysisPlatform/bap") (source (origin (method git-fetch) @@ -4084,58 +4084,64 @@ (define-public bap (file-name (git-file-name name version)) (sha256 (base32 - "0lb9xkfp67wjjqr75p6krivmjra7l5673236v9ny4gp0xi0755bk")))) + "1fw9pp0xnssc08qqfkcafffap4f46hw7zmk80gif5yc4nazga8w5")))) (build-system ocaml-build-system) - (native-inputs - `(("ocaml-oasis" ,(package-with-ocaml4.07 ocaml-oasis)) - ("clang" ,clang-3.8) - ("ocaml-ounit" ,(package-with-ocaml4.07 ocaml-ounit)))) - (propagated-inputs - `(("camlzip" ,(package-with-ocaml4.07 camlzip)) - ("ocaml-bitstring" ,(package-with-ocaml4.07 ocaml-bitstring)) - ("ocaml-cmdliner" ,(package-with-ocaml4.07 ocaml-cmdliner)) - ("ocaml-core-kernel" ,ocaml4.07-core-kernel) - ("ocaml-ezjsonm" ,(package-with-ocaml4.07 ocaml-ezjsonm)) - ("ocaml-fileutils" ,(package-with-ocaml4.07 ocaml-fileutils)) - ("ocaml-frontc" ,(package-with-ocaml4.07 ocaml-frontc)) - ("ocaml-graph" ,(package-with-ocaml4.07 ocaml-graph)) - ("ocaml-ocurl" ,(package-with-ocaml4.07 ocaml-ocurl)) - ("ocaml-piqi" ,(package-with-ocaml4.07 ocaml-piqi)) - ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-utop" ,ocaml4.07-utop) - ("ocaml-uuidm" ,(package-with-ocaml4.07 ocaml-uuidm)) - ("ocaml-uri" ,ocaml4.07-uri) - ("ocaml-zarith" ,(package-with-ocaml4.07 ocaml-zarith)))) - (inputs - (list gmp llvm-3.8 ncurses)) (arguments - `(#:use-make? #t + (list + #:use-make? #t #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-ncurses - (lambda _ - (substitute* "oasis/llvm" - (("-lcurses") "-lncurses")) - #t)) - (replace 'configure - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; add write for user, to prevent a failure in the install phase - (for-each - (lambda (file) - (let ((stat (stat file))) - (chmod file (+ #o200 (stat:mode stat))))) - (find-files "." ".")) - (invoke "./configure" "--prefix" - (assoc-ref outputs "out") - "--libdir" - (string-append + #~(modify-phases %standard-phases + (add-before 'configure 'fix-ncurses + (lambda _ + (substitute* "oasis/llvm" + (("-lcurses") "-lncurses")) + #t)) + (replace 'configure + (lambda* (#:key outputs inputs #:allow-other-keys) + (for-each make-file-writable (find-files "." ".")) + ;; Package name changed + (substitute* "oasis/elf-loader" + (("bitstring.ppx") "ppx_bitstring")) + ;; We don't have a monolithic llvm + (substitute* "oasis/llvm.setup.ml.in" + (("llvm_static = \"true\"") "true")) + (invoke "./configure" "--prefix" (assoc-ref outputs "out") - "/lib/ocaml/site-lib") - "--with-llvm-version=3.8" - "--with-llvm-config=llvm-config" - "--enable-everything")))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + "--libdir" + (string-append + (assoc-ref outputs "out") + "/lib/ocaml/site-lib") + (string-append "--with-llvm-version=" #$(package-version llvm)) + "--with-llvm-config=llvm-config" + "--disable-ghidra" + "--disable-llvm-static" + "--enable-llvm" + "--enable-everything")))))) + (native-inputs (list clang ocaml-oasis ocaml-ounit)) + (propagated-inputs + (list + camlzip + ocaml-bitstring + ocaml-cmdliner + ocaml-core-kernel + ocaml-ezjsonm + ocaml-fileutils + ocaml-frontc + ocaml-graph + ocaml-linenoise + ocaml-ocurl + ocaml-piqi + ocaml-ppx-bap + ocaml-ppx-bitstring + ocaml-re + ocaml-uri + ocaml-utop + ocaml-uuidm + ocaml-yojson + ocaml-z3 + ocaml-zarith)) + (inputs + (list gmp llvm ncurses)) (synopsis "Binary Analysis Platform") (description "Binary Analysis Platform is a framework for writing program analysis tools, that target binary files. The framework consists of a plethora -- 2.36.1