From patchwork Sun Mar 10 20:09:32 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: 61602 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 DED7E27BBE9; Sun, 10 Mar 2024 20:12:19 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 30FC727BBE2 for ; Sun, 10 Mar 2024 20:12:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjPWB-0003Rf-Ks; Sun, 10 Mar 2024 16:11:35 -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 1rjPWA-0003Qu-5N for guix-patches@gnu.org; Sun, 10 Mar 2024 16:11:34 -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 1rjPW9-0002PR-T8 for guix-patches@gnu.org; Sun, 10 Mar 2024 16:11:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rjPWh-0003jq-9P for guix-patches@gnu.org; Sun, 10 Mar 2024 16:12:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH v2 12/14] 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: Sun, 10 Mar 2024 20:12:07 +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 Cc: troy@troyfigiel.com Received: via spool by 69074-submit@debbugs.gnu.org id=B69074.171010150214243 (code B ref 69074); Sun, 10 Mar 2024 20:12:07 +0000 Received: (at 69074) by debbugs.gnu.org; 10 Mar 2024 20:11:42 +0000 Received: from localhost ([127.0.0.1]:37978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjPWH-0003ha-AE for submit@debbugs.gnu.org; Sun, 10 Mar 2024 16:11:41 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:32195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjPVy-0003gH-CO; Sun, 10 Mar 2024 16:11:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=nAZYKZR/ PPZbqXoMvg907y/dSFdBzFlA9TmxQ6jLfRQ=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=XaTXJhkROIzxbz/g7JB3GsSteb3 JtLcz9ehXekExbsazCAq3SlJonAP1w/D61OQw+3mJD/QJkzMrIlCMHkLjtcwczLhpB4emu ZtbFHR/G2lu6XBJJDCwfGVs8A2aE8MOJbi06fiSrs5vY3HWZZfSm2XQLDyEVJq4z0buvBb 0Vls= Received: from localhost (dynamic-2a02-3102-49da-001b-9766-31d2-bfd2-3d82.310.pool.telefonica.de [2a02:3102:49da:1b:9766:31d2:bfd2:3d82]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id cfa6161e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 10 Mar 2024 21:10:44 +0100 (CET) From: soeren@soeren-tempel.net Date: Sun, 10 Mar 2024 21:09:32 +0100 Message-ID: <354c7b431967b4dd15a9e4279f03242afbee156f.1710101374.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.44.0 In-Reply-To: <19ef0993fd8891d02402943609f70de73e0b233a.1710101374.git.soeren@soeren-tempel.net> References: <19ef0993fd8891d02402943609f70de73e0b233a.1710101374.git.soeren@soeren-tempel.net> 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 28bb1ac3cf..90debdcf76 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) @@ -114,6 +116,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 @@ -2192,106 +2195,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