From patchwork Sat Sep 9 23:07:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 53697 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 48DE527BBE9; Sun, 10 Sep 2023 00:10:21 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED,WEIRD_PORT 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 3EA0F27BBE2 for ; Sun, 10 Sep 2023 00:10:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qf75V-0005Fy-Hu; Sat, 09 Sep 2023 19:10:01 -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 1qf75T-0005EH-PP for guix-patches@gnu.org; Sat, 09 Sep 2023 19:09:59 -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 1qf75T-0004yC-Hm for guix-patches@gnu.org; Sat, 09 Sep 2023 19:09:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qf75W-0008A7-Br for guix-patches@gnu.org; Sat, 09 Sep 2023 19:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65848] [PATCH 1/1] gnu: Add asl. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Sep 2023 23:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65848 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65848@debbugs.gnu.org Received: via spool by 65848-submit@debbugs.gnu.org id=B65848.169430095331315 (code B ref 65848); Sat, 09 Sep 2023 23:10:02 +0000 Received: (at 65848) by debbugs.gnu.org; 9 Sep 2023 23:09:13 +0000 Received: from localhost ([127.0.0.1]:48610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qf74j-000890-2Q for submit@debbugs.gnu.org; Sat, 09 Sep 2023 19:09:13 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:55620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qf74f-00088k-PX for 65848@debbugs.gnu.org; Sat, 09 Sep 2023 19:09:11 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id CD88E63629 for <65848@debbugs.gnu.org>; Sat, 9 Sep 2023 23:09:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HNXxP34T_web for <65848@debbugs.gnu.org>; Sat, 9 Sep 2023 23:08:58 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id DA2C4635E8 for <65848@debbugs.gnu.org>; Sat, 9 Sep 2023 23:08:58 +0000 (UTC) From: Simon South Date: Sat, 9 Sep 2023 19:07:37 -0400 Message-ID: <685beda248a38ba8d3fb9c1db301e0fec4cd0bc5.1694299659.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 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 * gnu/packages/assembly.scm (asl): New variable. --- gnu/packages/assembly.scm | 61 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 81e38c3f41..f8777ede31 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2022 Felix Gruber ;;; Copyright © 2022 Andy Tai +;;; Copyright © 2023 Simon South ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ (define-module (gnu packages assembly) #:use-module (guix build-system meson) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module ((guix build utils) #:select (parallel-job-count)) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -55,10 +57,69 @@ (define-module (gnu packages assembly) #:use-module (gnu packages python) #:use-module (gnu packages sphinx) #:use-module (gnu packages shells) + #:use-module (gnu packages tex) #:use-module (gnu packages xml) #:use-module ((guix utils) #:select (%current-system cc-for-target))) +(define-public asl + (let ((build "247")) + (package + (name "asl") + (version (string-append "1.42-beta-" build)) + (source + (origin + (method url-fetch) + (uri (string-append + "http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/" + "asl-current-142-bld" build ".tar.bz2")) + (sha256 + (base32 "1qgz5yzg50vpwzrjqvw8bgnvm67dqhfb8ldxyqwaqmrj3icshp5s")))) + (build-system gnu-build-system) + (arguments + (list + #:make-flags #~(list "V=1") ; ensures output during "check" phase + #:phases + #~(modify-phases %standard-phases + (delete 'bootstrap) + (replace 'configure + (lambda* (#:key target #:allow-other-keys) + (copy-file "Makefile.def-samples/Makefile.def-unknown-linux" + "Makefile.def") + + ;; Use the cross-compilation tools when cross-compiling. + (when #$(%current-target-system) + (substitute* "Makefile.def" + (("^(TARG_(CC|LD) = ).*" all prefix) + (string-append prefix target "-gcc\n")))) + + ;; Set the output directories appropriately. + (substitute* "Makefile.def" + (("^(DOCDIR = ).*" all prefix) + (string-append prefix #$output:doc "/share/doc/" #$name)) + (("/usr/local") + #$output)))) + (add-after 'check 'build-doc + (lambda* (#:key parallel-build? #:allow-other-keys) + (invoke "make" + "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1") + "docs")))) + #:test-target "test")) + (native-inputs + (list (texlive-updmap.cfg (list texlive-german texlive-hyperref)))) + (outputs '("out" "doc")) + (home-page "http://john.ccac.rwth-aachen.de:8000/as/") + (synopsis + "AS macro cross-assembler for microprocessors and microcontrollers") + (description + "AS is a portable macro cross-assembler targeting a wide range of +microprocessors and microcontrollers, including devices from Intel, Motorola, +MOS Technology, Hitachi, Fujitsu, NEC, Texas Instruments, Zilog and many other +manufacturers.") + (license (list license:gpl2 license:gpl3))))) + (define-public nasm (package (name "nasm")