diff options
| author | Leo Famulari <leo@famulari.name> | 2015-10-18 15:40:06 -0400 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-21 19:05:47 +0200 |
| commit | 3dcbb75f63be519f5ce723117844c2f6c6639d89 (patch) | |
| tree | 4eb7bdfd60a000f33de61bf398ecd3e2afba869e /gnu/packages | |
| parent | 861be0cc1d1b2fc50be61b4815189e0d3b2075ed (diff) | |
| download | patches-3dcbb75f63be519f5ce723117844c2f6c6639d89.tar patches-3dcbb75f63be519f5ce723117844c2f6c6639d89.tar.gz | |
gnu: bash: Install more headers in "include" output.
* gnu/packages/bash.com (bash): Include contents of include directory in
"include" output.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/bash.scm | 15 |
1 files changed, 14 insertions, 1 deletions
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 <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; ;;; This file is part of GNU Guix. ;;; @@ -143,10 +144,17 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." ;; 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 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." (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 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." ;; 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 |