From: John Darrington <john@darrington.wattle.id.au>
To: Ludovic Court??s <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs".
Date: Sun, 15 Dec 2013 11:36:52 +0100 [thread overview]
Message-ID: <20131215103652.GA5807@intra> (raw)
In-Reply-To: <87bo0jqf3c.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 6214 bytes --]
On Sat, Dec 14, 2013 at 10:48:07PM +0100, Ludovic Court??s wrote:
Thanks for auditing all this!
> --- a/gnu/packages/gdb.scm
> +++ b/gnu/packages/gdb.scm
> @@ -56,9 +56,10 @@
> ("gmp" ,gmp)
> ("readline" ,readline)
> ("ncurses" ,ncurses)
> - ("python" ,python-wrapper)
> - ("texinfo" ,texinfo)
> ("dejagnu" ,dejagnu)))
> + (native-inputs
> + `(("python" ,python-wrapper)
> + ("texinfo" ,texinfo)))
Python must really be an input (GDB can use it as its extension
language???until it???s superseded by Guile :-)), and not a native input.
OK. I wasn't sure.
> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -123,16 +123,16 @@ shared NFS home directories.")
> "doc")) ; 20 MiB of GTK-Doc reference
> (inputs
> `(("coreutils" ,coreutils)
> - ("gettext" ,gnu-gettext)
> ("libffi" ,libffi)
> + ("zlib" ,zlib)
> + ("tzdata" ,tzdata))) ; for tests/gdatetime.c
> + (native-inputs
> + `(("gettext" ,gnu-gettext)
> + ("dbus" ,dbus) ; for GDBus tests
> ("pkg-config" ,pkg-config)
> ("python" ,python-wrapper)
> - ("zlib" ,zlib)
> ("perl" ,perl) ; needed by GIO tests
> - ("dbus" ,dbus) ; for GDBus tests
> - ("bash" ,bash)
> - ("tzdata" ,tzdata) ; for tests/gdatetime.c
> - ))
> + ("bash" ,bash)))
???dbus??? should be in ???inputs???.
OK.
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -84,9 +85,10 @@ features to enable users to create their discs easily and quickly.")
> "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"))))
> (build-system gnu-build-system)
> (inputs
> + `(("libxml2" ,libxml2)
> + ("libxslt" ,libxslt)))
> + (native-inputs
> `(("intltool" ,intltool)
> - ("libxml2" ,libxml2)
> - ("libxslt" ,libxslt)
> ("pkg-config" ,pkg-config)
> ("python-2" ,python-2)))
> (arguments
Running:
guix gc --references $(guix build gnome-doc-utils)
doesn???t show libxml2 and libxslt, so I think they are used for their
binaries (xsltproc, etc.) at build time. Thus, they should be in
???native-inputs???.
OK. I'll put them back for now. There are a lot of other issues preventing Gnome from cross compiling
so we'll deal with the issue later, if it arises.
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 8d26688..b756313 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -20,6 +20,7 @@
> (define-module (gnu packages gnupg)
> #:use-module (guix licenses)
> #:use-module (gnu packages curl)
> + #:use-module (gnu packages base)
> #:use-module (gnu packages openldap)
> #:use-module (gnu packages perl)
> #:use-module (gnu packages pth)
> @@ -235,7 +236,7 @@ and every application benefits from this.")
> (sha256 (base32
> "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d"))))
> (build-system gnu-build-system)
> - (inputs `(("perl" ,perl)
> + (native-inputs `(("perl" ,perl)
> ("python" ,python-wrapper)
> ("gpg" ,gnupg)))
What???s going on here?
This is probably erroneous. I'll revert it.
> --- a/gnu/packages/groff.scm
> +++ b/gnu/packages/groff.scm
> @@ -39,11 +39,12 @@
> (sha256 (base32
> "0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd6821q"))))
> (build-system gnu-build-system)
> - (inputs `(("bison" ,bison)
> - ("ghostscript" ,ghostscript)
> + (inputs `(("ghostscript" ,ghostscript)
> + ("netpbm" ,netpbm)
> + ("psutils" ,psutils)))
> + (native-inputs `(("bison" ,bison)
> ("netpbm" ,netpbm)
> ("perl" ,perl)
> - ("psutils" ,psutils)
> ("texinfo" ,texinfo)))
I think ???psutils??? should be ???native-inputs??? (it???s a set of programs.)
Ok. I'll put it back. (Ghostscript has some big cross-compile issues anyway)
> --- a/gnu/packages/libcanberra.scm
> +++ b/gnu/packages/libcanberra.scm
> @@ -46,9 +46,10 @@
> `(("alsa-lib" ,alsa-lib)
> ("gstreamer" ,gstreamer)
> ("gtk+" ,gtk+)
> - ("libtool" ,libtool)
> - ("libvorbis" ,libvorbis)
> - ("pkg-config" ,pkg-config)))
> + ("libvorbis" ,libvorbis)))
> + (native-inputs
> + `(("libtool" ,libtool)
> + ("pkg-config" ,pkg-config)))
Libtool should be in ???inputs???, because it???s for libltdl (???libtool??? is a
multiple-output package, and it???s default output contains just libltdl.)
There are several formatting issue. If you???re using Emacs, make sure it
honors our .dir-locals.el (which GNU Emacs >= 23 normally does) and that
you???re in scheme-mode when editing.
I was indeed using Emacs (23.4.1) in scheme mode. Please also note that the reference mentioned
in HACKING (http://mumble.net/~campbell/scheme/style.txt) regards as acceptable, many of the
styles you wanted changed. I will however send a patch according to your suggestions.
Updated patch forthcomming (hopefully).
J'
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2013-12-15 10:37 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-14 17:43 [PATCH 1/5] gnu: libxml2: Fixed cross-compilation John Darrington
2013-12-14 17:43 ` [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues John Darrington
2013-12-14 18:19 ` Ludovic Courtès
2013-12-14 19:02 ` John Darrington
2013-12-14 21:06 ` Ludovic Courtès
2013-12-15 8:24 ` John Darrington
2013-12-15 8:39 ` [PATCH] gnu: gnupg: Fix " John Darrington
2013-12-15 21:24 ` Ludovic Courtès
2013-12-15 21:14 ` [PATCH 2/5] gnu: gnupg: Fixed " Ludovic Courtès
2014-01-07 10:32 ` John Darrington
2013-12-14 17:43 ` [PATCH 3/5] gnu: tzdata: Added "source" as input John Darrington
2013-12-14 18:24 ` Ludovic Courtès
2013-12-14 17:43 ` [PATCH 4/5] gnu: openssl: Fixed cross-compile issues John Darrington
2013-12-14 17:57 ` Ludovic Courtès
2013-12-14 18:02 ` John Darrington
2013-12-14 21:01 ` Ludovic Courtès
2013-12-15 8:03 ` [PATCH] gnu: openssl: Fix " John Darrington
2013-12-15 21:18 ` Ludovic Courtès
2013-12-14 17:43 ` [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs" John Darrington
2013-12-14 21:48 ` Ludovic Courtès
2013-12-15 10:36 ` John Darrington [this message]
2013-12-15 11:01 ` [PATCH] gnu: Move numerous " John Darrington
2013-12-15 21:32 ` Ludovic Courtès
2013-12-14 17:48 ` [PATCH 1/5] gnu: libxml2: Fixed cross-compilation Ludovic Courtès
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=20131215103652.GA5807@intra \
--to=john@darrington.wattle.id.au \
--cc=guix-devel@gnu.org \
--cc=ludo@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 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).