mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 15:36:20 -05:00
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>
This commit is contained in:
parent
861be0cc1d
commit
3dcbb75f63
1 changed files with 14 additions and 1 deletions
|
@ -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 @@ (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
|
||||
|
|
Loading…
Reference in a new issue