From: Attila Lendvai <attila@lendvai.name>
To: 61750@debbugs.gnu.org
Cc: Attila Lendvai <attila@lendvai.name>
Subject: [bug#61750] [PATCH 1/2] gnu: shepherd: Build Shepherd from git.
Date: Fri, 24 Feb 2023 15:02:43 +0100 [thread overview]
Message-ID: <20230224140243.15315-1-attila@lendvai.name> (raw)
The rationale for this is that it makes it simpler to start VM's with a
Shepherd that is compiled from a local checkout. This facilitates hacking on
Shepherd itself, and testing it in the Guix init environment, by speeding up
the edit-compile-test cycle.
* gnu/packages/admin.scm (shepherd-0.9): Source points to the git repo; adjust
native-inputs accordingly. Also delete the strip build phase.
---
the first commit works, except when cross-compiling: help2man wants
to run the foreign binary, and fails.
the second commit is a WIP attempt to get the compiled man pages
from the native package when cross compiling. it's not ready,
but i got stuck at needing to gunzip the man pages, and where
to put them to convince the makefile to not execute help2man, etc.
my suggestion is to simply get rid of the not-very-useful
auto generated man page to fix cross-compilation.
if that's not desirable, then the second commit needs to be
polished, or implemented some other way.
gnu/packages/admin.scm | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d4cc8ca6ca..91f98bf48e 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -335,12 +335,13 @@ (define-public shepherd-0.9
(inherit shepherd)
(version "0.9.3")
(source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/shepherd/shepherd-"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/shepherd.git/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "shepherd" version))
(sha256
- (base32
- "0qy2yq13xhf05an5ilz7grighdxicx56211yaarqq5qigiiybc32"))))
+ (base32 "1pvdpx2mfki8wvhcac54p8fn5idqszicww60ikswszz2cv5d0s11"))))
(arguments
(list #:configure-flags #~'("--localstatedir=/var")
#:make-flags #~'("GUILE_AUTO_COMPILE=0")
@@ -360,12 +361,17 @@ (define-public shepherd-0.9
(this-package-input "guile-fibers")
"/lib/guile/3.0/site-ccache"))))))
#~%standard-phases)))
-
- ;; Note: Use 'guile-3.0-latest' to address the continuation-related memory
- ;; leak reported at <https://issues.guix.gnu.org/58631>.
- (native-inputs (list pkg-config guile-3.0-latest
- guile-fibers-1.1)) ;for cross-compilation
- (inputs (list guile-3.0-latest guile-fibers-1.1))))
+ (native-inputs
+ (list autoconf
+ automake
+ gettext-minimal
+ guile-3.0
+ guile-fibers-1.1 ; for cross-compilation
+ help2man
+ pkg-config
+ texinfo))
+ (inputs (list guile-3.0
+ guile-fibers-1.1))))
(define-public guile2.2-shepherd
(package
--
2.38.1
next reply other threads:[~2023-02-24 14:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-24 14:02 Attila Lendvai [this message]
2023-02-24 14:07 ` [bug#61750] [PATCH 2/2] WIP failing attempt to get the man page while cross-compiling Attila Lendvai
2023-07-29 14:31 ` [bug#61750] [PATCH] gnu: shepherd: Build Shepherd from git Attila Lendvai
2023-10-31 17:03 ` Attila Lendvai
2023-11-05 14:47 ` Ludovic Courtès
2023-11-13 9:38 ` Attila Lendvai
2023-11-17 15:26 ` Attila Lendvai
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230224140243.15315-1-attila@lendvai.name \
--to=attila@lendvai.name \
--cc=61750@debbugs.gnu.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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.