[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/12] gnu: Add function libiconv-if-needed.
From: |
Jan Nieuwenhuizen |
Subject: |
[PATCH 04/12] gnu: Add function libiconv-if-needed. |
Date: |
Thu, 18 Aug 2016 08:08:43 +0200 |
* gnu/packages/base.scm (libiconv-if-needed): New function.
---
gnu/packages/base.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index a476837..fe11a87 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -46,7 +46,8 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (ice-9 match)
- #:export (glibc))
+ #:export (glibc
+ libiconv-if-needed))
;;; Commentary:
;;;
@@ -997,6 +998,16 @@ program. It supports a wide variety of different
encodings.")
(home-page "http://www.gnu.org/software/libiconv/")
(license lgpl3+)))
+(define* (libiconv-if-needed #:optional (target (%current-target-system)))
+ "Return either a libiconv package specification to include in a dependency
+list for platforms that have an incomplete libc, or the empty list. If a
+package needs iconv ,@(libiconv-if-needed) should be added."
+ ;; POSIX C libraries provide iconv. Platforms with an incomplete libc
+ ;; without iconv, such as MinGW, must return the then clause.
+ (if (target-mingw? target)
+ `(("libiconv" ,libiconv))
+ '()))
+
(define-public (canonical-package package)
;; Avoid circular dependency by lazily resolving 'commencement'.
(let* ((iface (resolve-interface '(gnu packages commencement)))
--
2.9.2
- MinGW guile.exe cross build patch series v10, Jan Nieuwenhuizen, 2016/08/18
- [PATCH 02/12] gnu: Add mingw-w64., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 03/12] gnu: cross-build: i686-w64-mingw32: new cross target., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 04/12] gnu: Add function libiconv-if-needed.,
Jan Nieuwenhuizen <=
- [PATCH 05/12] gnu: libunistring: support mingw: propagate libiconv if needed., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 06/12] gnu: gmp: build shared library for mingw., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 08/12] gnu: cross-base: Add cross-libtool., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 09/12] gnu: libtool: support cross-libtool mingw., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 07/12] gnu: ncurses: support mingw., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 12/12] gnu: guile-2.0: support mingw., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 01/12] gnu: Add gcc-cross-x86_64 packages for testing., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 10/12] gnu: ncurses: build mingw with libtool., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 11/12] gnu: readline: support mingw., Jan Nieuwenhuizen, 2016/08/18