From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 1/3] gnu: bash: Install more headers in "include" output. Date: Sun, 18 Oct 2015 15:40:06 -0400 Message-ID: <1b6f624a413dba09cc9f4505036feb6d88f64674.1445196542.git.leo@famulari.name> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZntoY-0000KB-J9 for guix-devel@gnu.org; Sun, 18 Oct 2015 15:40:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZntoV-0006p2-Cc for guix-devel@gnu.org; Sun, 18 Oct 2015 15:40:18 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:50184) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZntoV-0006oP-9a for guix-devel@gnu.org; Sun, 18 Oct 2015 15:40:15 -0400 Received: from jasmine.lan (c-69-249-5-231.hsd1.pa.comcast.net [69.249.5.231]) by mail.messagingengine.com (Postfix) with ESMTPA id 966A168017B for ; Sun, 18 Oct 2015 15:40:12 -0400 (EDT) In-Reply-To: In-Reply-To: References: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * 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 ;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2015 Leo Famulari ;;; ;;; 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