guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 1/3] gnu: bash: Install more headers in "include" output.


From: Leo Famulari
Subject: [PATCH 1/3] gnu: bash: Install more headers in "include" output.
Date: Sun, 18 Oct 2015 15:40:06 -0400

* gnu/packages/bash.com (bash): Include contents of include directory in
  "include" output.
---
 gnu/packages/bash.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index 180c64e..e1ddd7c 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 <address@hidden>
 ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2015 Leo Famulari <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -143,9 +144,16 @@ 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) includes file)
+                             (let ((directory (string-append include)))
+                               (mkdir-p directory)
+                               (copy-file file
+                                          (string-append directory "/"
+                                                         (basename file)))))
                            (when ((@ (ice-9 regex) string-match) headers file)
                              (let ((directory (string-append include "/"
                                                              (dirname file))))
@@ -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
-- 
2.6.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]