diff options
| author |   Sam James <sam@gentoo.org> | 2022-09-23 09:22:00 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-09-23 09:23:00 +0100 |
| commit | a9720529caa34a39ed0bdf1e759068fad943011b (patch) | |
| tree | 9cb5b2d2cfe2e2008c8725a438b3d53ac499a565 /sys-apps | |
| parent | app-admin/awscli: add 1.25.80 (diff) | |
| download | gentoo-a9720529caa34a39ed0bdf1e759068fad943011b.tar.gz gentoo-a9720529caa34a39ed0bdf1e759068fad943011b.tar.bz2 gentoo-a9720529caa34a39ed0bdf1e759068fad943011b.zip | |
sys-apps/busybox: adjust non-static deps for libcrypt/libc
It's a bit of a weird one in that we don't end up doing
this for every single package when it's non-static,
but the libcrypt dep was wrong anyway for -static,
and busybox is a special case anyway in that
someone is quite likely to want to build
a tiny system with only busybox and possibly
a custom built application within.
Closes: https://bugs.gentoo.org/872497
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/busybox/busybox-1.34.1-r1.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.34.1.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.35.0-r1.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.35.0.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-9999.ebuild | 7 |
5 files changed, 25 insertions, 10 deletions
diff --git a/sys-apps/busybox/busybox-1.34.1-r1.ebuild b/sys-apps/busybox/busybox-1.34.1-r1.ebuild index 8fb10aebdff0..1c76b4ce84f7 100644 --- a/sys-apps/busybox/busybox-1.34.1-r1.ebuild +++ b/sys-apps/busybox/busybox-1.34.1-r1.ebuild @@ -27,8 +27,11 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 RDEPEND=" - virtual/libcrypt:= - !static? ( selinux? ( sys-libs/libselinux ) ) + !static? ( + virtual/libc + virtual/libcrypt:= + selinux? ( sys-libs/libselinux ) + ) pam? ( sys-libs/pam ) " DEPEND="${RDEPEND} diff --git a/sys-apps/busybox/busybox-1.34.1.ebuild b/sys-apps/busybox/busybox-1.34.1.ebuild index 502b590fd4ae..a983429625d9 100644 --- a/sys-apps/busybox/busybox-1.34.1.ebuild +++ b/sys-apps/busybox/busybox-1.34.1.ebuild @@ -27,8 +27,11 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 RDEPEND=" - virtual/libcrypt:= - !static? ( selinux? ( sys-libs/libselinux ) ) + !static? ( + virtual/libc + virtual/libcrypt:= + selinux? ( sys-libs/libselinux ) + ) pam? ( sys-libs/pam ) " DEPEND="${RDEPEND} diff --git a/sys-apps/busybox/busybox-1.35.0-r1.ebuild b/sys-apps/busybox/busybox-1.35.0-r1.ebuild index 76d06dcb9b29..d08c6a826b69 100644 --- a/sys-apps/busybox/busybox-1.35.0-r1.ebuild +++ b/sys-apps/busybox/busybox-1.35.0-r1.ebuild @@ -28,8 +28,11 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 RDEPEND=" - virtual/libcrypt:= - !static? ( selinux? ( sys-libs/libselinux ) ) + !static? ( + virtual/libc + virtual/libcrypt:= + selinux? ( sys-libs/libselinux ) + ) pam? ( sys-libs/pam ) " DEPEND="${RDEPEND} diff --git a/sys-apps/busybox/busybox-1.35.0.ebuild b/sys-apps/busybox/busybox-1.35.0.ebuild index 24f99089f847..223e6ce2486d 100644 --- a/sys-apps/busybox/busybox-1.35.0.ebuild +++ b/sys-apps/busybox/busybox-1.35.0.ebuild @@ -28,8 +28,11 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 RDEPEND=" - virtual/libcrypt:= - !static? ( selinux? ( sys-libs/libselinux ) ) + !static? ( + virtual/libc + virtual/libcrypt:= + selinux? ( sys-libs/libselinux ) + ) pam? ( sys-libs/pam ) " DEPEND="${RDEPEND} diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index 5e059850212f..6450127bf54b 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -27,8 +27,11 @@ RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 RDEPEND=" - virtual/libcrypt:= - !static? ( selinux? ( sys-libs/libselinux ) ) + !static? ( + virtual/libc + virtual/libcrypt:= + selinux? ( sys-libs/libselinux ) + ) pam? ( sys-libs/pam ) " DEPEND="${RDEPEND} |