Subject: [PATCH v3 2/2] gnu: packages: Use absolute headers inclusion.

From: Olivier Dion <[email-masked]>
Date: Thu, 21 Apr 2022 12:46:19 -0400

* gnu/packages/instrumentation.scm (lttng-ust):
[phases]: Add absolute-inclusions.

* gnu/packages/datastructures.scm (liburcu):
[phases]: Add absolute-inclusions.
---
 gnu/packages/datastructures.scm  | 11 +++++++++++
 gnu/packages/instrumentation.scm | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm
index f247231ecf..042fc8114e 100644
--- a/gnu/packages/datastructures.scm
+++ b/gnu/packages/datastructures.scm
@@ -26,6 +26,7 @@ (define-module (gnu packages datastructures)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages perl)
+  #:use-module (guix gexp)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -146,6 +147,16 @@ (define-public liburcu
                (base32
                 "10rh6v9j13622cjlzx31cfpghjy0kqkvn6pb42whwwcg5cyz64rj"))))
     (build-system gnu-build-system)
+    (arguments
+      (list #:imported-modules
+            `(,@%gnu-build-system-modules (guix build absolute-inclusions))
+            #:modules '((guix build gnu-build-system)
+                        (guix build absolute-inclusions)
+                        (guix build utils))
+            #:phases
+            #~(modify-phases %standard-phases
+                (add-after 'install 'absolute-inclusions
+                  patch-header-inclusions))))
     (native-inputs
      (list perl))                 ; for tests
     (home-page "https://liburcu.org/")
diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm
index ab986bfcc7..672189a068 100644
--- a/gnu/packages/instrumentation.scm
+++ b/gnu/packages/instrumentation.scm
@@ -215,6 +215,17 @@ (define-public lttng-ust
     (build-system gnu-build-system)
     (inputs
      (list liburcu numactl))
+    (arguments
+     (list
+      #:imported-modules
+            `(,@%gnu-build-system-modules (guix build absolute-inclusions))
+            #:modules '((guix build gnu-build-system)
+                        (guix build absolute-inclusions)
+                        (guix build utils))
+            #:phases
+            #~(modify-phases %standard-phases
+                (add-after 'install 'absolute-inclusions
+                  patch-header-inclusions))))
     (native-inputs
      (list python-3 pkg-config))
     (home-page "https://lttng.org/")
-- 
2.35.1