mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
sys-libs/libnbd: Remove "which", fix bash completions
Satisfy Portage's bash-completions check by creating the symlinks even though the corresponding binaries are never built. Closes: https://bugs.gentoo.org/960679 Closes: https://bugs.gentoo.org/962784 Signed-off-by: Christopher Byrne <salah.coronya@gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/45370 Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 6c7cae8a..d938f140 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -432,7 +432,7 @@ HEADING([Checking for bash])
|
||||
dnl Bash must be at least version 4. If it is too old, fail hard
|
||||
dnl with a good diagnostic. Note macOS ships an ancient version
|
||||
dnl of bash (https://gitlab.com/nbdkit/nbdkit/-/issues/21)
|
||||
-bash=`which bash`
|
||||
+bash=$(command -v bash)
|
||||
AC_MSG_CHECKING([for the major version of $bash])
|
||||
bash_major=`bash -c 'echo ${BASH_VERSINFO:-0}'`
|
||||
AC_MSG_RESULT([$bash_major])
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -47,6 +47,7 @@ BDEPEND="dev-lang/perl"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.22.2-build-Remove-automagic-compiling-of-examples.patch"
|
||||
"${FILESDIR}/${PN}-1.22.2-Makefile.am-Conditionally-compile-some-SUBDIRS.patch"
|
||||
"${FILESDIR}/${PN}-1.22.5-which-hunt.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
@@ -103,6 +104,9 @@ src_configure() {
|
||||
src_install() {
|
||||
default
|
||||
|
||||
use fuse || bashcomp_alias nbdsh nbdfuse
|
||||
bashcomp_alias nbdsh nbdublk
|
||||
|
||||
use ocaml && strip-lto-bytecode
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
|
||||
@@ -47,6 +47,7 @@ BDEPEND="dev-lang/perl"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.22.2-build-Remove-automagic-compiling-of-examples.patch"
|
||||
"${FILESDIR}/${PN}-1.22.2-Makefile.am-Conditionally-compile-some-SUBDIRS.patch"
|
||||
"${FILESDIR}/${PN}-1.22.5-which-hunt.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
@@ -103,6 +104,9 @@ src_configure() {
|
||||
src_install() {
|
||||
default
|
||||
|
||||
use fuse || bashcomp_alias nbdsh nbdfuse
|
||||
bashcomp_alias nbdsh nbdublk
|
||||
|
||||
use ocaml && strip-lto-bytecode
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
|
||||
Reference in New Issue
Block a user