GNU bug report logs - #66888
[PATCH 1/2] gnu: babeltrace: Do not install bindings as egg.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 66888 in the body.
You can then email your comments to 66888 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: odion <at> efficios.com
To: guix-patches <at> gnu.org
Cc: Olivier Dion <odion <at> efficios.com>
Subject: [PATCH 1/2] gnu: babeltrace: Do not install bindings as egg.
Date: Wed,  1 Nov 2023 16:30:22 -0400

From: Olivier Dion <odion <at> efficios.com>

Oddly enough, bindings were now installed as an egg.  Fix this by
forcing setuptools to install individual files with
`--single-version-externally-managed'

*
gnu/packages/instrumentation.scm (babeltrace)[arguments]<#:make-flags>:
Pass it via DISTSETUPOPTS.

Change-Id: I143dd16179e1e4728cb8e5d6b00b06359da83389
---
 gnu/packages/instrumentation.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm
index 7fa7b2f7ba..0d6513aaca 100644
--- a/gnu/packages/instrumentation.scm
+++ b/gnu/packages/instrumentation.scm
@@ -85,7 +85,9 @@ (define-public babeltrace
      `(#:tests? #f  ; FIXME - When Python's bindings are enabled, tests do not
                     ; pass.
        #:make-flags
-       ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
+       ,#~(list
+           (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")
+           "DISTSETUPOPTS=--single-version-externally-managed")
        #:configure-flags
        '("--enable-debug-info"
          "--enable-man-pages"
-- 
2.41.0

Message #8 received at 66888 <at> debbugs.gnu.org (full text, mbox):

From: odion <at> efficios.com
To: 66888 <at> debbugs.gnu.org
Cc: Olivier Dion <odion <at> efficios.com>
Subject: [PATCH 2/2] gnu: Add babeltrace/dev.
Date: Wed,  1 Nov 2023 16:35:16 -0400

From: Olivier Dion <odion <at> efficios.com>

This dev variant of the package babeltrace is slower, but allows better
developement of plugins as recommended by the authors.

* gnu/packages/instrumentation.scm (babeltrace/dev): New variable.

Change-Id: Ib54ced9a1ede5d9acc9a53ff325663a28a3b447f
---
 gnu/packages/instrumentation.scm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm
index 0d6513aaca..4c92c81105 100644
--- a/gnu/packages/instrumentation.scm
+++ b/gnu/packages/instrumentation.scm
@@ -97,11 +97,9 @@ (define-public babeltrace
        (modify-phases %standard-phases
          ;; These are recommended in the project's README for a development
          ;; build configuration.
-         (add-before 'configure 'set-environment-variables
+         (add-after 'unpack 'reconfigure
            (lambda _
-             (setenv "BABELTRACE_DEV_MODE" "1")
-             (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE")
-             (invoke "autoreconf" "-vfi"))))))
+             (delete-file "configure"))))))
     (inputs
      (list glib))
     ;; NOTE - elfutils is used for the LTTng debug information filter
@@ -143,6 +141,18 @@ (define-public babeltrace
 bindings, and the command-line tool @command{babeltrace2}.")
     (license license:expat)))
 
+(define-public babeltrace/dev
+  (package/inherit babeltrace
+    (name "babeltrace-dev")
+    (arguments
+     (substitute-keyword-arguments (package-arguments babeltrace)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-before 'configure 'set-environment-variables
+             (lambda _
+               (setenv "BABELTRACE_DEV_MODE" "1")
+               (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE")))))))))
+
 (define-public barectf
   (package
     (name "barectf")
-- 
2.41.0

Message #13 received at 66888-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: odion <at> efficios.com
Cc: 66888-done <at> debbugs.gnu.org
Subject: Re: [bug#66888] [PATCH 1/2] gnu: babeltrace: Do not install
 bindings as egg.
Date: Wed, 22 Nov 2023 16:05:01 +0100

Hi,

odion <at> efficios.com skribis:

> From: Olivier Dion <odion <at> efficios.com>
>
> Oddly enough, bindings were now installed as an egg.  Fix this by
> forcing setuptools to install individual files with
> `--single-version-externally-managed'
>
> *
> gnu/packages/instrumentation.scm (babeltrace)[arguments]<#:make-flags>:
> Pass it via DISTSETUPOPTS.
>
> Change-Id: I143dd16179e1e4728cb8e5d6b00b06359da83389

[...]

> From: Olivier Dion <odion <at> efficios.com>
>
> This dev variant of the package babeltrace is slower, but allows better
> developement of plugins as recommended by the authors.
>
> * gnu/packages/instrumentation.scm (babeltrace/dev): New variable.
>
> Change-Id: Ib54ced9a1ede5d9acc9a53ff325663a28a3b447f

I applied both after turning comments in the commit log into comments in
the source so they’re directly visible.

Thanks,
Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.