From: Jan Nieuwenhuizen <janneke@gnu.org>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH 06a/10] gnu: Add libiconv.
Date: Tue, 03 May 2016 18:55:20 +0200 [thread overview]
Message-ID: <87wpnbkrnr.fsf_-_@drakenvlieg.flower> (raw)
In-Reply-To: <87h9efbaeh.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 03 May 2016 14:20:38 +0200")
[-- Attachment #1: Type: text/plain, Size: 1091 bytes --]
Ludovic Courtès writes:
> Manolis Ragkousis <manolis837@gmail.com> skribis:
>
>> On 04/29/2016 06:12 PM, Jan Nieuwenhuizen wrote:
>>> + #:use-module (guix build-system trivial)
>>> + #:export (glibc
>>> + libiconv-if-needed))
>>
>> The #:export (glibc...) part only exists in wip-hurd so we need to
>> remove this in order for your patch to apply on master.
>
> Yes.
(already) done.
>> Maybe we should break this patch into two different ones, one for the
>> libiconv package description and one for the libiconv-if-needed. The
>> first will go to master and the second to core-updates. WDYT?
>
> Seconded: the patch that adds libiconv (and only that) can go directly
> in master; the patch that adds ‘libiconv-if-needed’ must be separate
> since it depends on the MinGW stuff.
Split up-now into 6a/10 and 6b/10.
Ah, Sorry!! libiconv-if-needed depends on mingw-target? which sits in
guix/utils.scm. I had that in patch 0004, and so I assumed that would
go in first and be OK. IIUC, 0004 may go into core-updates...
Greetings,
Jan
[-- Attachment #2: 0006a-gnu-Add-libiconv.patch --]
[-- Type: text/x-diff, Size: 2602 bytes --]
From e3d01e6075ece0269131fb35cd560c05d37a586e Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 3 May 2016 18:48:40 +0200
Subject: [PATCH 6a/10] gnu: Add libiconv.
* gnu/packages/base.scm (libiconv): New variable.
---
gnu/packages/base.scm | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 1c4ebbf..3819ecc 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,7 +25,7 @@
(define-module (gnu packages base)
#:use-module ((guix licenses)
- #:select (gpl3+ lgpl2.0+ public-domain))
+ #:select (gpl3+ lgpl2.0+ lgpl3+ public-domain))
#:use-module (gnu packages)
#:use-module (gnu packages acl)
#:use-module (gnu packages bash)
@@ -43,7 +44,8 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
- #:use-module (guix build-system trivial))
+ #:use-module (guix build-system trivial)
+ #:export (libiconv-if-needed))
;;; Commentary:
;;;
@@ -936,6 +938,27 @@ reflect changes made by political bodies to time zone boundaries, UTC offsets,
and daylight-saving rules.")
(license public-domain)))
+(define-public libiconv
+ (package
+ (name "libiconv")
+ (version "1.14")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://gnu/libiconv/libiconv-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj"))))
+ (build-system gnu-build-system)
+ (synopsis "Character set conversion library")
+ (description
+ "libiconv provides an implementation of the iconv function for systems
+that lack it. iconv is used to convert between character encodings in a
+program. It supports a wide variety of different encodings.")
+ (home-page "http://www.gnu.org/software/libiconv/")
+ (license lgpl3+)))
+
(define-public (canonical-package package)
;; Avoid circular dependency by lazily resolving 'commencement'.
(let* ((iface (resolve-interface '(gnu packages commencement)))
--
2.7.3
[-- Attachment #3: Type: text/plain, Size: 154 bytes --]
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
next prev parent reply other threads:[~2016-05-03 16:56 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-29 15:12 [PATCH 01/10] gnu: cross: Use CROSS_*_INCLUDE_PATH for system headers Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 02/10] gnu: bootstrap: Add i686-mingw Jan Nieuwenhuizen
2016-04-29 15:34 ` Manolis Ragkousis
2016-04-29 18:28 ` Jan Nieuwenhuizen
2016-05-01 11:02 ` Manolis Ragkousis
2016-04-29 15:12 ` [PATCH 03/10] gnu: Add mingw-w64 Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 04/10] gnu: cross-build: i686-w64-mingw32: new cross target Jan Nieuwenhuizen
2016-05-02 8:06 ` Andy Wingo
2016-05-02 18:34 ` Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 05/10] gnu: gmp: build shared library for mingw Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 06/10] gnu: Add libiconv Jan Nieuwenhuizen
2016-05-01 17:07 ` Manolis Ragkousis
2016-05-01 17:43 ` John Darrington
2016-05-01 18:58 ` Jan Nieuwenhuizen
2016-05-01 19:07 ` John Darrington
2016-05-03 12:19 ` Ludovic Courtès
2016-05-01 18:27 ` Jan Nieuwenhuizen
2016-05-03 12:20 ` Ludovic Courtès
2016-05-03 16:55 ` Jan Nieuwenhuizen [this message]
2016-05-05 14:56 ` [PATCH 06a/10] " Ludovic Courtès
2016-05-03 16:56 ` [PATCH 06b/10] gnu: Add function libiconv-if-needed Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 07/10] gnu: ncurses: support mingw Jan Nieuwenhuizen
2016-05-02 8:09 ` Andy Wingo
2016-05-02 18:41 ` Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 08/10] gnu: readline: " Jan Nieuwenhuizen
2016-05-02 8:12 ` Andy Wingo
2016-05-02 18:52 ` Jan Nieuwenhuizen
2016-05-02 19:25 ` Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 09/10] gnu: libunistring: support mingw: propagate libiconv if needed Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 10/10] gnu: guile-2.0: support mingw Jan Nieuwenhuizen
2016-05-02 8:04 ` [PATCH 01/10] gnu: cross: Use CROSS_*_INCLUDE_PATH for system headers Andy Wingo
2016-05-02 17:59 ` Jan Nieuwenhuizen
2016-05-03 12:06 ` Ludovic Courtès
2016-05-03 13:27 ` Andy Wingo
2016-05-03 12:16 ` Ludovic Courtès
2016-05-14 5:29 ` Mark H Weaver
2016-05-14 6:37 ` Jan Nieuwenhuizen
2016-05-14 8:25 ` FIXUP: " Jan Nieuwenhuizen
2016-05-14 20:05 ` Ludovic Courtès
2016-05-14 20:50 ` Jan Nieuwenhuizen
2016-05-16 21:02 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wpnbkrnr.fsf_-_@drakenvlieg.flower \
--to=janneke@gnu.org \
--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 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.