From 3dcbb75f63be519f5ce723117844c2f6c6639d89 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 18 Oct 2015 15:40:06 -0400 Subject: gnu: bash: Install more headers in "include" output. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bash.com (bash): Include contents of include directory in "include" output. Signed-off-by: Ludovic Courtès --- gnu/packages/bash.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu/packages/bash.scm') diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 180c64e872..714fa8c596 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2015 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -143,10 +144,17 @@ (define-public bash ;; guile-bash expect. (let ((include (string-append (assoc-ref outputs "include") "/include/bash")) + (includes "^\\./include/[^/]+\\.h$") (headers "^\\./(builtins/|lib/glob/|lib/tilde/|)[^/]+\\.h$")) (mkdir-p include) (for-each (lambda (file) - (when ((@ (ice-9 regex) string-match) headers file) + (when (string-match includes file) + (let ((directory (string-append include))) + (mkdir-p directory) + (copy-file file + (string-append directory "/" + (basename file))))) + (when (string-match headers file) (let ((directory (string-append include "/" (dirname file)))) (mkdir-p directory) @@ -154,6 +162,7 @@ (define-public bash (string-append directory "/" (basename file)))))) (find-files "." "\\.h$")) + (delete-file (string-append include "/" "y.tab.h")) #t))) (version "4.3")) (package @@ -199,6 +208,10 @@ (define-public bash ;; for now. #:tests? #f + #:modules ((ice-9 regex) + (guix build utils) + (guix build gnu-build-system)) + #:phases (modify-phases %standard-phases (add-after 'install 'post-install ,post-install-phase) (add-after 'install 'install-headers -- cgit v1.2.3 From c30f65237b647dfe2d836ae3ceba3af970e3d8c7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 18 Oct 2015 15:40:07 -0400 Subject: gnu: bash: Use 'install-file' instead of 'mkdir-p' and 'copy-file'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bash.scm (bash): Use 'install-file' instead of 'mkdir-p' and 'copy-file'. Signed-off-by: Ludovic Courtès --- gnu/packages/bash.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'gnu/packages/bash.scm') diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 714fa8c596..b2f23a8442 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -149,18 +149,11 @@ (define-public bash (mkdir-p include) (for-each (lambda (file) (when (string-match includes file) - (let ((directory (string-append include))) - (mkdir-p directory) - (copy-file file - (string-append directory "/" - (basename file))))) + (install-file file include)) (when (string-match headers file) - (let ((directory (string-append include "/" - (dirname file)))) - (mkdir-p directory) - (copy-file file - (string-append directory "/" - (basename file)))))) + (install-file file + (string-append include "/" + (dirname file))))) (find-files "." "\\.h$")) (delete-file (string-append include "/" "y.tab.h")) #t))) -- cgit v1.2.3 From a2a9bba43cbc32efe6a654455d1789c6964dfbc5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 15 Dec 2015 17:59:49 +0100 Subject: gnu: bash: Update to patch level 42. * gnu/packages/bash.scm (%patch-series-4.3): Add patches 40 to 42. --- gnu/packages/bash.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/bash.scm') diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index a2d76b9673..9d544dbb9e 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -93,7 +93,11 @@ (define %patch-series-4.3 (36 "0z6jbyy70lfdm6d3x0sbazbqdxb3xnpn9bmz7madpvrnbd284pxc") (37 "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k") (38 "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd") - (39 "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b"))) + (39 "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b") + (40 "0sypv66vsldmc95gwvf7ylz1k7y37vnvdsjg8ajjr6b2j9mkkfw4") + (41 "06ic2gdpbi1afik3wqf9d4vh95if4bz8bmhcgr555621dsb35i2f") + (42 "06a90k0p6bqc4wk2dsmapna69124an76xvlnlj3xm497vci968dc"))) + (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of number/base32-hash tuples, directly usable in the 'patch-series' form." -- cgit v1.2.3 From 4d28b97c46e9d9ff201df7cdc8f28b78155eea82 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 15 Dec 2015 22:22:59 +0100 Subject: gnu: bash: Add "doc" output. * gnu/packages/bash.scm (bash)[outputs]: Add "doc" output. --- gnu/packages/bash.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/bash.scm') diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 9d544dbb9e..15909c7e88 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -183,8 +183,9 @@ (define-public bash (build-system gnu-build-system) (outputs '("out" - "include")) ;headers used by extensions - (native-inputs `(("bison" ,bison))) ;to rebuild the parser + "doc" ;1.7 MiB of HTML and extra files + "include")) ;headers used by extensions + (native-inputs `(("bison" ,bison))) ;to rebuild the parser (inputs `(("readline" ,readline) ("ncurses" ,ncurses))) ;TODO: add texinfo (arguments @@ -212,7 +213,7 @@ (define-public bash #:phases (modify-phases %standard-phases (add-after 'install 'post-install ,post-install-phase) (add-after 'install 'install-headers - ,install-headers-phase)))) + ,install-headers-phase)))) (synopsis "The GNU Bourne-Again SHell") (description "Bash is the shell, or command-line interpreter, of the GNU system. It -- cgit v1.2.3