me/guix
Archived
1
0
Fork 0
Code Activity

gnu: bash: Install more headers in "include" output.

Browse source 
* 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:
Leo Famulari 2015-10-18 15:40:06 -04:00 • committed by Ludovic Courtès
parent 861be0cc1d
commit 3dcbb75f63
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/bash.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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. ;; guile-bash expect.
(let ((include (string-append (assoc-ref outputs "include") (let ((include (string-append (assoc-ref outputs "include")
"/include/bash")) "/include/bash"))
(includes "^\\./include/[^/]+\\.h$")
(headers "^\\./(builtins/|lib/glob/|lib/tilde/|)[^/]+\\.h$")) (headers "^\\./(builtins/|lib/glob/|lib/tilde/|)[^/]+\\.h$"))
(mkdir-p include) (mkdir-p include)
(for-each (lambda (file) (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 "/" (let ((directory (string-append include "/"
(dirname file)))) (dirname file))))
(mkdir-p directory) (mkdir-p directory)
@ -154,6 +162,7 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
(string-append directory "/" (string-append directory "/"
(basename file)))))) (basename file))))))
(find-files "." "\\.h$")) (find-files "." "\\.h$"))
(delete-file (string-append include "/" "y.tab.h"))
#t))) #t)))
(version "4.3")) (version "4.3"))
(package (package
@ -199,6 +208,10 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
;; for now. ;; for now.
#:tests? #f #:tests? #f
#:modules ((ice-9 regex)
(guix build utils)
(guix build gnu-build-system))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'install 'post-install ,post-install-phase) (add-after 'install 'post-install ,post-install-phase)
(add-after 'install 'install-headers (add-after 'install 'install-headers