* /bin/sh in configure tests @ 2013-01-13 22:06 Andreas Enge 2013-01-13 22:17 ` Ludovic Courtès 0 siblings, 1 reply; 6+ messages in thread From: Andreas Enge @ 2013-01-13 22:06 UTC (permalink / raw) To: bug-guix [-- Attachment #1: Type: text/plain, Size: 294 bytes --] A package I am trying to build contains the following lines in its configure: case `/bin/sh -c "echo -n x"` in -n*) case `/bin/sh -c "echo 'x\c'"` in ... Would it make sense to globally add a rule to patch-shebangs so that "`/bin/sh" is replaced? If not, how can this be handled? Andreas [-- Attachment #2: Type: text/html, Size: 2400 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: /bin/sh in configure tests 2013-01-13 22:06 /bin/sh in configure tests Andreas Enge @ 2013-01-13 22:17 ` Ludovic Courtès 2013-01-16 13:56 ` Andreas Enge 0 siblings, 1 reply; 6+ messages in thread From: Ludovic Courtès @ 2013-01-13 22:17 UTC (permalink / raw) To: Andreas Enge; +Cc: bug-guix Andreas Enge <andreas@enge.fr> skribis: > A package I am trying to build contains the following lines in its > configure: > > case `/bin/sh -c "echo -n x"` in > -n*) > case `/bin/sh -c "echo 'x\c'"` in > ... > > Would it make sense to globally add a rule to patch-shebangs so that > "`/bin/sh" is replaced? If not, how can this be handled? If by globally you mean in gnu-build-system.scm, then I think that may be too risky. But in the package itself, you can add a phase that does: (substitute* "configure" (("`/bin/sh") (string-append "`" (which "bash")))) HTH, Ludo’. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: /bin/sh in configure tests 2013-01-13 22:17 ` Ludovic Courtès @ 2013-01-16 13:56 ` Andreas Enge 2013-01-16 14:33 ` Ludovic Courtès 0 siblings, 1 reply; 6+ messages in thread From: Andreas Enge @ 2013-01-16 13:56 UTC (permalink / raw) To: Ludovic Courtès; +Cc: bug-guix [-- Attachment #1.1: Type: text/plain, Size: 319 bytes --] Am Sonntag, 13. Januar 2013 schrieb Ludovic Courtès: > But in the package itself, you can add a phase that does: > (substitute* "configure" > (("`/bin/sh") > (string-append "`" (which "bash")))) > HTH, Yes, it does! Attached is a patch for a new package. If it is okay, I can push it. Andreas [-- Attachment #1.2: Type: text/html, Size: 2298 bytes --] [-- Attachment #2: 0001-distro-Add-icu4c-nternational-Components-for-Unicode.patch --] [-- Type: text/x-patch, Size: 3882 bytes --] From 77b1f7d8241c24e321aac844ce4a4ad0e5157aba Mon Sep 17 00:00:00 2001 From: Andreas Enge <andreas@enge.fr> Date: Wed, 16 Jan 2013 14:54:32 +0100 Subject: [PATCH] distro: Add icu4c (nternational Components for Unicode). * distro/packages/icu4c.scm: New file. * Makefile.am (MODULES): Add it. --- Makefile.am | 1 + distro/packages/icu4c.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 distro/packages/icu4c.scm diff --git a/Makefile.am b/Makefile.am index 1a239eb..713dd8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,6 +75,7 @@ MODULES = \ distro/packages/gsasl.scm \ distro/packages/guile.scm \ distro/packages/help2man.scm \ + distro/packages/icu4c.scm \ distro/packages/idutils.scm \ distro/packages/ld-wrapper.scm \ distro/packages/less.scm \ diff --git a/distro/packages/icu4c.scm b/distro/packages/icu4c.scm new file mode 100644 index 0000000..ee977c9 --- /dev/null +++ b/distro/packages/icu4c.scm @@ -0,0 +1,68 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (distro packages icu4c) + #:use-module (distro) + #:use-module (distro packages perl) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu)) + +(define-public icu4c + (package + (name "icu4c") + (version "50.1.1") + (source (origin + (method url-fetch) + (uri (string-append "http://download.icu-project.org/files/icu4c/" + version + "/icu4c-" + (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) + "-src.tgz")) + (sha256 (base32 + "13yz0kk6zsgj94idnlr3vbg8iph5z4ly4b4xrd5wfja7q3ijdx56")))) + (build-system gnu-build-system) + (inputs `(("perl" ,perl) + )) + (arguments + (lambda (system) + `(#:phases + (alist-replace + 'unpack + (lambda* (#:key source #:allow-other-keys) + (and (zero? (system* "tar" "xvf" source)) + (chdir "icu/source"))) + (alist-replace + 'configure + (lambda* (#:key #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure))) + ; patch out two occurrences of /bin/sh from configure script + ; that might have disappeared in a release later than 50.1.1 + (substitute* "configure" + (("`/bin/sh") + (string-append "`" (which "bash")))) + (apply configure args))) + %standard-phases))))) + (synopsis "ICU, International Components for Unicode") + (description + "ICU is a set of C/C++ and Java libraries providing Unicode and +globalisation support for software applications. This package contains the +C/C++ part.") + (license x11) + (home-page "http://site.icu-project.org/"))) -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: /bin/sh in configure tests 2013-01-16 13:56 ` Andreas Enge @ 2013-01-16 14:33 ` Ludovic Courtès 2013-01-16 16:32 ` Andreas Enge 0 siblings, 1 reply; 6+ messages in thread From: Ludovic Courtès @ 2013-01-16 14:33 UTC (permalink / raw) To: Andreas Enge; +Cc: bug-guix Hello! Andreas Enge <andreas@enge.fr> skribis: > Yes, it does! Attached is a patch for a new package. If it is okay, I can > push it. Just minor nitpicking below, but if it builds in a chroot without /bin or anything, please push! > + (inputs `(("perl" ,perl) > + )) Please put closing parentheses at the end of the line. > + (arguments > + (lambda (system) Since the ‘system’ variable isn’t used, you don’t need a lambda here. Instead you can just write: (arguments `(#:phases ...)) > + (substitute* "configure" > + (("`/bin/sh") > + (string-append "`" (which "bash")))) The opening parenthesis on the second line is normally aligned with the ‘u’ of ‘substitute*’. :-) Thanks, Ludo’. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: /bin/sh in configure tests 2013-01-16 14:33 ` Ludovic Courtès @ 2013-01-16 16:32 ` Andreas Enge 2013-01-16 16:44 ` Ludovic Courtès 0 siblings, 1 reply; 6+ messages in thread From: Andreas Enge @ 2013-01-16 16:32 UTC (permalink / raw) To: Ludovic Courtès; +Cc: bug-guix [-- Attachment #1: Type: text/plain, Size: 418 bytes --] Am Mittwoch, 16. Januar 2013 schrieb Ludovic Courtès: > Just minor nitpicking below, but if it builds in a chroot without /bin > or anything, please push! Okay, all implemented. > The opening parenthesis on the second line is normally aligned with the > ‘u’ of ‘substitute*’. :-) Are the rules written somewhere to look them up? It looks very different from what I am used to in C. Andreas [-- Attachment #2: Type: text/html, Size: 2664 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: /bin/sh in configure tests 2013-01-16 16:32 ` Andreas Enge @ 2013-01-16 16:44 ` Ludovic Courtès 0 siblings, 0 replies; 6+ messages in thread From: Ludovic Courtès @ 2013-01-16 16:44 UTC (permalink / raw) To: Andreas Enge; +Cc: bug-guix Andreas Enge <andreas@enge.fr> skribis: > Are the rules written somewhere to look them up? It looks very different > from what I am used to in C. For general Scheme coding style, I mostly follow <http://mumble.net/~campbell/scheme/style.txt>. There’s also a .dir-locals.el file in the repo that sets up Emacs to do things correctly for all the special forms we use, such as ‘substitute*’. Thanks, Ludo’. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-16 16:44 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-01-13 22:06 /bin/sh in configure tests Andreas Enge 2013-01-13 22:17 ` Ludovic Courtès 2013-01-16 13:56 ` Andreas Enge 2013-01-16 14:33 ` Ludovic Courtès 2013-01-16 16:32 ` Andreas Enge 2013-01-16 16:44 ` Ludovic Courtès
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).