all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: guix-devel@gnu.org
Subject: [PATCH 1/3] gnu: bash: Install more headers in "include" output.
Date: Sun, 18 Oct 2015 15:40:06 -0400	[thread overview]
Message-ID: <1b6f624a413dba09cc9f4505036feb6d88f64674.1445196542.git.leo@famulari.name> (raw)
In-Reply-To: <cover.1445196542.git.leo@famulari.name>
In-Reply-To: <cover.1445196542.git.leo@famulari.name>

* 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 <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,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	other threads:[~2015-10-18 19:40 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-18 19:40 [PATCH 0/3] Fix bash:include and build recutils' Bash builtin Leo Famulari
2015-10-18 19:40 ` Leo Famulari [this message]
2015-10-21 19:22   ` [PATCH 1/3] gnu: bash: Install more headers in "include" output Ludovic Courtès
2015-10-22 22:56     ` Leo Famulari
2015-10-18 19:40 ` [PATCH 2/3] gnu: bash: Use 'install-file' instead of 'mkdir-p' and 'copy-file' Leo Famulari
2015-10-18 19:40 ` [PATCH 3/3] gnu: recutils: Build the Bash builtin, readrec Leo Famulari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1b6f624a413dba09cc9f4505036feb6d88f64674.1445196542.git.leo@famulari.name \
    --to=leo@famulari.name \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.