Hi,
Vivien Kraus <[email protected]> skribis:
> * gnu/packages/build-tools.scm (gnulib) [phase reset-shebangs]: After
> installation, rewrite the /gnu/store shebangs in the distributed build-aux
> files.
> [inputs, native-inputs]: Add bash-minimal.
> [phase let-autogen-execute-gnulib-tool]: Specify a shell to execute
> gnulib-tool from autogen.sh.
Applied with tweaks to the commit log.
> + (substitute* (find-files
> + (string-append #$output "/src/gnulib")
> + (lambda (fname stat)
> + (and (not (string-suffix?
> "/lib/javaversion.class" fname))
> + (not (string-suffix? ".mo" fname)))))
This leaves the shebang on ‘bin/gnulib-tool’, such that ‘gnulib’ keeps a
reference to ‘bash-minimal’ (and nothing else).
It’s not even convenient though because…
> * gnu/packages/tls.scm (guile-gnutls) [phase patch-more-shebangs]: Fix how
> autogen.sh invokes gnulib-tool, and how configure.ac invokes git-version-gen,
> so as not to rely on shebangs.
[...]
> + (substitute* "autogen.sh"
> + (("\\$gnulib_tool \\$gnulib_tool_options")
> + "sh $gnulib_tool $gnulib_tool_options"))
… this is still needed: GNULIB/bin/gnulib-tool, which has a correct
shebang, is *not* used, and instead GNULIB/src/gnulib/gnulib-tool is
used.
Should we remove GNULIB/bin/gnulib-tool? Or should we remove the other
one?
Anyway, applied as well, thank you!
Ludo’.
