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

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

[odion]

From: Olivier Dion <odion@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

[bug#66888] [PATCH 2/2] gnu: Add babeltrace/dev.

[odion]

From: Olivier Dion <odion@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

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

[Ludovic Courtès]

Hi,

odion@efficios.com skribis:

> From: Olivier Dion <odion@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@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’.