From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: Re: [PATCH 06a/10] gnu: Add libiconv. Date: Tue, 03 May 2016 18:55:20 +0200 Message-ID: <87wpnbkrnr.fsf_-_@drakenvlieg.flower> References: <1461942751-23883-1-git-send-email-janneke@gnu.org> <1461942751-23883-6-git-send-email-janneke@gnu.org> <9b320678-3af9-22c5-ead5-23126e43f57c@gmail.com> <87h9efbaeh.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axdcY-0000Cn-Vt for guix-devel@gnu.org; Tue, 03 May 2016 12:56:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axdcN-0000Yg-3e for guix-devel@gnu.org; Tue, 03 May 2016 12:56:21 -0400 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") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Manolis Ragkousis 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 =E2=80=98libiconv-if-needed=E2=80=99 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 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0006a-gnu-Add-libiconv.patch Content-Transfer-Encoding: quoted-printable >From e3d01e6075ece0269131fb35cd560c05d37a586e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen 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 =C2=A9 2014 Alex Kost ;;; Copyright =C2=A9 2014, 2015 Manolis Fragkiskos Ragkousis ;;; Copyright =C2=A9 2016 Efraim Flashner +;;; Copyright =C2=A9 2016 Jan Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,7 +25,7 @@ =20 (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)) =20 ;;; Commentary: ;;; @@ -936,6 +938,27 @@ reflect changes made by political bodies to time zone = boundaries, UTC offsets, and daylight-saving rules.") (license public-domain))) =20 +(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))) --=20 2.7.3 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.nl= =20=20 --=-=-=--