* [bug#66888] [PATCH 1/2] gnu: babeltrace: Do not install bindings as egg.
@ 2023-11-01 20:30 odion
2023-11-01 20:35 ` [bug#66888] [PATCH 2/2] gnu: Add babeltrace/dev odion
2023-11-22 15:05 ` bug#66888: [PATCH 1/2] gnu: babeltrace: Do not install bindings as egg Ludovic Courtès
0 siblings, 2 replies; 3+ messages in thread
From: odion @ 2023-11-01 20:30 UTC (permalink / raw)
To: 66888; +Cc: Olivier Dion
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#66888] [PATCH 2/2] gnu: Add babeltrace/dev.
2023-11-01 20:30 [bug#66888] [PATCH 1/2] gnu: babeltrace: Do not install bindings as egg odion
@ 2023-11-01 20:35 ` odion
2023-11-22 15:05 ` bug#66888: [PATCH 1/2] gnu: babeltrace: Do not install bindings as egg Ludovic Courtès
1 sibling, 0 replies; 3+ messages in thread
From: odion @ 2023-11-01 20:35 UTC (permalink / raw)
To: 66888; +Cc: Olivier Dion
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#66888: [PATCH 1/2] gnu: babeltrace: Do not install bindings as egg.
2023-11-01 20:30 [bug#66888] [PATCH 1/2] gnu: babeltrace: Do not install bindings as egg odion
2023-11-01 20:35 ` [bug#66888] [PATCH 2/2] gnu: Add babeltrace/dev odion
@ 2023-11-22 15:05 ` Ludovic Courtès
1 sibling, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2023-11-22 15:05 UTC (permalink / raw)
To: odion; +Cc: 66888-done
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’.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-22 15:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-01 20:30 [bug#66888] [PATCH 1/2] gnu: babeltrace: Do not install bindings as egg odion
2023-11-01 20:35 ` [bug#66888] [PATCH 2/2] gnu: Add babeltrace/dev odion
2023-11-22 15:05 ` bug#66888: [PATCH 1/2] gnu: babeltrace: Do not install bindings as egg Ludovic Courtès
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).