From patchwork Mon Feb 12 14:58:27 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: 60203 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 E00E327BBE2; Mon, 12 Feb 2024 15:11:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 9F2EA27BBE9 for ; Mon, 12 Feb 2024 15:11:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZXxK-0000vI-Sc; Mon, 12 Feb 2024 10:10:50 -0500 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 1rZXxI-0000uX-Vm for guix-patches@gnu.org; Mon, 12 Feb 2024 10:10:49 -0500 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 1rZXxI-0006HS-NQ for guix-patches@gnu.org; Mon, 12 Feb 2024 10:10:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZXxZ-0001xG-IV for guix-patches@gnu.org; Mon, 12 Feb 2024 10:11:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH] gnu: unicorn: Update to 2.0.1.post1. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Feb 2024 15:11:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@debbugs.gnu.org Received: via spool by 69074-submit@debbugs.gnu.org id=B69074.17077506237305 (code B ref 69074); Mon, 12 Feb 2024 15:11:05 +0000 Received: (at 69074) by debbugs.gnu.org; 12 Feb 2024 15:10:23 +0000 Received: from localhost ([127.0.0.1]:35935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZXws-0001td-51 for submit@debbugs.gnu.org; Mon, 12 Feb 2024 10:10:23 -0500 Received: from magnesium.8pit.net ([2001:19f0:6c01:4ae:5400:ff:fe66:af9d]:36193) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZXm8-0006kx-0V; Mon, 12 Feb 2024 09:59:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=opensmtpd; bh=H1Z1D8YeaY wLOkcv4qWEB4b7nqMbAFOTxApcQOSYYAs=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=PWA81phlu5VE8H45Z2QaV/mZJ4uxc/ 8MmEhS9Y34S7Otm4NvMEsmX2IF5wjUw73QKkQ/2gq3l3/tdjLAAwhmGShgH2RJCAuc7Fkt BdnpPPfyIV9IGpGvP5wgokwYYFY40itDyDCw7rjOaf6AF3wlzIp8uOxCPl9SDi81QmlwM5 I= Received: from localhost (dynamic-2a02-3102-49da-001b-6371-147f-665b-ad6e.310.pool.telefonica.de [2a02:3102:49da:1b:6371:147f:665b:ad6e]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 76c9afb5 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Mon, 12 Feb 2024 15:58:53 +0100 (CET) From: soeren@soeren-tempel.net Date: Mon, 12 Feb 2024 15:58:27 +0100 Message-ID: <143cc3f98ea37b51ef7cd80d19b0e00c9c417149.1707749005.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.43.1 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: c4droid * gnu/packages/emulators.scm (unicorn) Update to 2.0.1.post1. Co-authored-by: Sören Tempel --- gnu/packages/emulators.scm | 119 +++++++------------------------------ 1 file changed, 20 insertions(+), 99 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index cde3ee052c..df6ca235d7 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 Hendursaga ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 Sören Tempel ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages containers) #:use-module (gnu packages cross-base) @@ -113,6 +115,7 @@ (define-module (gnu packages emulators) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix build-system qt)) (define-public vice @@ -2191,106 +2194,24 @@ (define-public bsnes performance, features, and ease of use.") (license license:gpl3))) -;; python-pwntools requires a -rc release of unicorn (define-public unicorn - (let ((unless-x86 - (lambda (code) - (if (member (%current-system) '("x86_64-linux" "i686-linux")) - '() - code)))) - (package - (name "unicorn") - (version "1.0.2-rc4") - ;; NOTE: unicorn ships a bundled QEMU, but with a lot of custom modifications. - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/unicorn-engine/unicorn") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy")))) - (outputs '("out" "python")) - ;; The main library is not written in Python, but the build process has - ;; little in common with any defined build system, so we might as well - ;; build on top of python-build-system and make use of all - ;; the Python-specific phases that can be reused. - (build-system python-build-system) - (arguments - `(#:modules ((srfi srfi-26) - (guix build python-build-system) - (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-before 'build 'build-library - (lambda* (#:key inputs #:allow-other-keys) - (invoke "make" - "-j" (number->string (parallel-job-count)) - "UNICORN_STATIC=no" - "CC=gcc"))) - (add-after 'build-library 'install-library - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "install" - "UNICORN_STATIC=no" - (string-append - "PREFIX=" - (assoc-ref outputs "out"))))) - (add-before 'build 'prepare-bindings - (lambda* (#:key outputs #:allow-other-keys) - (chdir "bindings/python") - ;; Set this environment variable so that the Python bindings - ;; don't build their own copy of the shared object, but use - ;; a dummy value such that the bindings test suite uses the - ;; same mechanism for loading the library as any other user. - (setenv "LIBUNICORN_PATH" "1") - (substitute* "unicorn/unicorn.py" - (("_path_list = \\[.*") - (string-append - "_path_list = [\"" - (assoc-ref outputs "out") - ;; eat the rest of the list - "/lib\"] + 0*["))) - #t)) - (add-before 'check 'check-library - (lambda* (#:key outputs #:allow-other-keys) - (for-each - (lambda (suite) - (with-directory-excursion - (string-append "../../tests/" suite) - (invoke "make" "test" "CC=gcc" - ,@(unless-x86 - '("AS=i686-unknown-linux-gnu-as" - "OBJCOPY=i686-unknown-linux-gnu-objcopy"))))) - '("unit" "regress")) - #t)) - (add-after 'install 'install-samples - (lambda* (#:key outputs #:allow-other-keys) - (let* ((python-samples (find-files "." "sample_.*")) - (c-samples (find-files "../../samples" ".*\\.c")) - (python-docdir - (string-append (assoc-ref outputs "python") - "/share/doc/unicorn/samples")) - (c-docdir - (string-append (assoc-ref outputs "out") - "/share/doc/unicorn/samples"))) - (for-each (cut install-file <> c-docdir) c-samples) - (for-each (cut install-file <> python-docdir) python-samples) - #t)))))) - (native-inputs - ;; NOTE: cross-binutils needs to be wrapped with unless-x86, as otherwise - ;; the linker provided by the package will be used, circumventing the ld-wrapper. - `(,@(unless-x86 - `(("assembler-for-tests" ,(cross-binutils "i686-unknown-linux-gnu")))) - ("cmocka" ,cmocka) - ("hexdump-for-tests" ,util-linux))) - (home-page "https://www.unicorn-engine.org") - (synopsis "Unicorn CPU emulator framework") - (description - "Unicorn is a lightweight, multi-platform, multi-architecture CPU emulator -framework based on QEMU.") - (license license:gpl2+)))) + (package + (name "unicorn") + (version "2.0.1.post1") + (source (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 + "0mlfs8qfi0clyncfkbxp6in0cpl747510i6bqymwid43xcirbikz")))) + (build-system pyproject-build-system) + (native-inputs (list cmake pkg-config)) + (home-page "https://www.unicorn-engine.org") + (synopsis "Generic CPU emulator framework") + (description + "Uniforn is a lightweight, multi-platform, multi-architecture CPU +emulator framework based on QEMU.") + (license license:gpl2+))) (define-public ppsspp (package