unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: David Elsing <david.elsing@posteo.net>
To: 64448@debbugs.gnu.org
Cc: David Elsing <david.elsing@posteo.net>,
	andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net
Subject: [bug#64448] [PATCH 2/2] gnu: hdf5-1.14: Remove spurious include directories.
Date: Mon,  3 Jul 2023 22:00:47 +0000	[thread overview]
Message-ID: <b0793725aa2561a6e9bab30d85e1f87895de1b76.1688421399.git.david.elsing@posteo.net> (raw)
In-Reply-To: <cover.1688421399.git.david.elsing@posteo.net>

* gnu/packages/maths.scm (hdf5-1.14)[arguments]: Use
'substitute-keyword-arguments' to add 'remove-subfiling-cppflags phase.
---
 gnu/packages/maths.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b2029db615..5ba9e07058 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1672,7 +1672,18 @@ (define-public hdf5-1.14
         (base32 "181bdh8hp7v9xqwcby3lknr92lxlicc2hqscba3f5nhf8lrr9rz4"))
        (modules '((guix build utils)))
        (snippet hdf5-snippet)
-       (patches (search-patches "hdf5-config-date.patch"))))))
+       (patches (search-patches "hdf5-config-date.patch"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments hdf5-1.10)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            ;; Remove include flag to directory in source tree
+            (add-after 'configure 'remove-subfiling-cppflags
+              (lambda _
+                (substitute* '("src/libhdf5.settings"
+                               "bin/h5cc"
+                               "c++/src/h5c++")
+                  (("-I.*/src/H5FDsubfiling") ""))))))))))
 
 (define-public hdf5
   ;; Default version of HDF5.
-- 
2.40.1





  parent reply	other threads:[~2023-07-03 22:02 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-03 21:58 [bug#64448] [PATCH 0/2] Fix hdf5-1.14 wrappers and remove generated source files from all hdf5 versions David Elsing
2023-07-03 22:00 ` [bug#64448] [PATCH 1/2] gnu: hdf5-1.8: Remove generated files from source David Elsing
2023-07-03 22:00 ` David Elsing [this message]
2023-07-04 21:14 ` [bug#64448] [PATCH 0/2] Fix hdf5-1.14 wrappers and remove generated source files from all hdf5 versions David Elsing
2023-07-24 13:49 ` Andreas Enge
2023-07-24 14:00   ` Andreas Enge
2023-09-25 22:06     ` David Elsing
2023-08-21  0:36   ` Gerd Heber
2023-08-21 20:24     ` Andreas Enge
2023-08-21 20:38       ` Andreas Enge

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

  List information: https://guix.gnu.org/

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

  git send-email \
    --in-reply-to=b0793725aa2561a6e9bab30d85e1f87895de1b76.1688421399.git.david.elsing@posteo.net \
    --to=david.elsing@posteo.net \
    --cc=64448@debbugs.gnu.org \
    --cc=andreas@enge.fr \
    --cc=bavier@posteo.net \
    --cc=efraim@flashner.co.il \
    /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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).