Message ID | 20231101203022.28546-1-odion@efficios.com |
---|---|
State | New |
Headers | show |
Series | [bug#66888,1/2] gnu: babeltrace: Do not install bindings as egg. | expand |
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’.
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"
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(-)