From: iyzsong--- via Guix-patches via <guix-patches@gnu.org>
To: 65681@debbugs.gnu.org
Cc: 宋文武 <iyzsong@member.fsf.org>
Subject: [bug#65681] [PATCH 1/2] gnu: simh: Update to 3.12-4.
Date: Fri, 1 Sep 2023 22:51:02 +0800 [thread overview]
Message-ID: <37f99d5eea2fc5a389cb3e498e4af8c75b37890b.1693579858.git.iyzsong@member.fsf.org> (raw)
From: 宋文武 <iyzsong@member.fsf.org>
* gnu/packages/simh.scm (simh): Update to 3.12-4.
[source]: Switch to url-fetch.
[native-inputs]: Add unzip.
[arguments]: Adjust make-flags.
---
gnu/packages/simh.scm | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm
index 81d26bbde0..2cf92516ba 100644
--- a/gnu/packages/simh.scm
+++ b/gnu/packages/simh.scm
@@ -23,39 +23,47 @@ (define-module (gnu packages simh)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
- #:use-module (gnu packages admin))
+ #:use-module (guix utils)
+ #:use-module (gnu packages admin)
+ #:use-module (gnu packages compression))
(define-public simh
(package
(name "simh")
- (version "3.9-0")
+ (version "3.12-4")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/simh/simh")
- (commit (string-append "v" version))))
+ (method url-fetch)
+ (uri (list (string-append
+ "http://simh.trailing-edge.com/sources/simhv"
+ (string-delete #\. version) ".zip")
+ (string-append
+ "http://simh.trailing-edge.com/sources/archive/simhv"
+ (string-delete #\. version) ".zip")))
(sha256
- (base32 "1jiq6shj6a9xvzacvmyhxxd6xdyica8q4006qqjh5mh96rxrp15c"))
- (file-name (git-file-name name version))))
+ (base32 "1i78c1x8xjiwy9dd2ss0mk3f1v9pmcjb4zc37ikqnjarsfqj2nm0"))))
(build-system gnu-build-system)
+ (native-inputs
+ (list unzip))
(inputs
(list libpcap))
(arguments
- '(#:tests? #f
+ `(#:tests? #f
#:make-flags (list
- "LDFLAGS=-lm"
- (string-append "INCPATH="
- (assoc-ref %build-inputs "libpcap")
- "/include")
- (string-append "LIBPATH="
- (assoc-ref %build-inputs "libpcap")
- "/lib"))
+ (string-append "GCC=" ,(cc-for-target) " -fcommon"))
+ #:modules ((ice-9 string-fun)
+ ,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'prepare-build
(lambda _
+ (substitute* "makefile"
+ (("LIBPATH:=/usr/lib")
+ (string-append "LIBPATH:="
+ (string-replace-substring
+ (getenv "LIBRARY_PATH") ":" " ")))
+ (("export LIBRARY_PATH = .*") ""))
(mkdir "BIN")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
base-commit: 4e531e55dcdc99c83bcfe3eec67c3fd95c7b6ca7
--
2.41.0
next reply other threads:[~2023-09-01 14:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-01 14:51 iyzsong--- via Guix-patches via [this message]
2023-09-01 14:53 ` [bug#65681] [PATCH 2/2] gnu: simh: Use G-Expressions iyzsong--- via Guix-patches via
2023-09-06 0:51 ` bug#65681: [PATCH 1/2] gnu: simh: Update to 3.12-4 Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=37f99d5eea2fc5a389cb3e498e4af8c75b37890b.1693579858.git.iyzsong@member.fsf.org \
--to=guix-patches@gnu.org \
--cc=65681@debbugs.gnu.org \
--cc=iyzsong@envs.net \
--cc=iyzsong@member.fsf.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).