| 1 |
commit: a9720529caa34a39ed0bdf1e759068fad943011b |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 23 08:22:00 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 23 08:23:00 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9720529 |
| 7 |
|
| 8 |
sys-apps/busybox: adjust non-static deps for libcrypt/libc |
| 9 |
|
| 10 |
It's a bit of a weird one in that we don't end up doing |
| 11 |
this for every single package when it's non-static, |
| 12 |
but the libcrypt dep was wrong anyway for -static, |
| 13 |
and busybox is a special case anyway in that |
| 14 |
someone is quite likely to want to build |
| 15 |
a tiny system with only busybox and possibly |
| 16 |
a custom built application within. |
| 17 |
|
| 18 |
Closes: https://bugs.gentoo.org/872497 |
| 19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 20 |
|
| 21 |
sys-apps/busybox/busybox-1.34.1-r1.ebuild | 7 +++++-- |
| 22 |
sys-apps/busybox/busybox-1.34.1.ebuild | 7 +++++-- |
| 23 |
sys-apps/busybox/busybox-1.35.0-r1.ebuild | 7 +++++-- |
| 24 |
sys-apps/busybox/busybox-1.35.0.ebuild | 7 +++++-- |
| 25 |
sys-apps/busybox/busybox-9999.ebuild | 7 +++++-- |
| 26 |
5 files changed, 25 insertions(+), 10 deletions(-) |
| 27 |
|
| 28 |
diff --git a/sys-apps/busybox/busybox-1.34.1-r1.ebuild b/sys-apps/busybox/busybox-1.34.1-r1.ebuild |
| 29 |
index 8fb10aebdff0..1c76b4ce84f7 100644 |
| 30 |
--- a/sys-apps/busybox/busybox-1.34.1-r1.ebuild |
| 31 |
+++ b/sys-apps/busybox/busybox-1.34.1-r1.ebuild |
| 32 |
@@ -27,8 +27,11 @@ RESTRICT="test" |
| 33 |
|
| 34 |
# TODO: Could make pkgconfig conditional on selinux? bug #782829 |
| 35 |
RDEPEND=" |
| 36 |
- virtual/libcrypt:= |
| 37 |
- !static? ( selinux? ( sys-libs/libselinux ) ) |
| 38 |
+ !static? ( |
| 39 |
+ virtual/libc |
| 40 |
+ virtual/libcrypt:= |
| 41 |
+ selinux? ( sys-libs/libselinux ) |
| 42 |
+ ) |
| 43 |
pam? ( sys-libs/pam ) |
| 44 |
" |
| 45 |
DEPEND="${RDEPEND} |
| 46 |
|
| 47 |
diff --git a/sys-apps/busybox/busybox-1.34.1.ebuild b/sys-apps/busybox/busybox-1.34.1.ebuild |
| 48 |
index 502b590fd4ae..a983429625d9 100644 |
| 49 |
--- a/sys-apps/busybox/busybox-1.34.1.ebuild |
| 50 |
+++ b/sys-apps/busybox/busybox-1.34.1.ebuild |
| 51 |
@@ -27,8 +27,11 @@ RESTRICT="test" |
| 52 |
|
| 53 |
# TODO: Could make pkgconfig conditional on selinux? bug #782829 |
| 54 |
RDEPEND=" |
| 55 |
- virtual/libcrypt:= |
| 56 |
- !static? ( selinux? ( sys-libs/libselinux ) ) |
| 57 |
+ !static? ( |
| 58 |
+ virtual/libc |
| 59 |
+ virtual/libcrypt:= |
| 60 |
+ selinux? ( sys-libs/libselinux ) |
| 61 |
+ ) |
| 62 |
pam? ( sys-libs/pam ) |
| 63 |
" |
| 64 |
DEPEND="${RDEPEND} |
| 65 |
|
| 66 |
diff --git a/sys-apps/busybox/busybox-1.35.0-r1.ebuild b/sys-apps/busybox/busybox-1.35.0-r1.ebuild |
| 67 |
index 76d06dcb9b29..d08c6a826b69 100644 |
| 68 |
--- a/sys-apps/busybox/busybox-1.35.0-r1.ebuild |
| 69 |
+++ b/sys-apps/busybox/busybox-1.35.0-r1.ebuild |
| 70 |
@@ -28,8 +28,11 @@ RESTRICT="test" |
| 71 |
|
| 72 |
# TODO: Could make pkgconfig conditional on selinux? bug #782829 |
| 73 |
RDEPEND=" |
| 74 |
- virtual/libcrypt:= |
| 75 |
- !static? ( selinux? ( sys-libs/libselinux ) ) |
| 76 |
+ !static? ( |
| 77 |
+ virtual/libc |
| 78 |
+ virtual/libcrypt:= |
| 79 |
+ selinux? ( sys-libs/libselinux ) |
| 80 |
+ ) |
| 81 |
pam? ( sys-libs/pam ) |
| 82 |
" |
| 83 |
DEPEND="${RDEPEND} |
| 84 |
|
| 85 |
diff --git a/sys-apps/busybox/busybox-1.35.0.ebuild b/sys-apps/busybox/busybox-1.35.0.ebuild |
| 86 |
index 24f99089f847..223e6ce2486d 100644 |
| 87 |
--- a/sys-apps/busybox/busybox-1.35.0.ebuild |
| 88 |
+++ b/sys-apps/busybox/busybox-1.35.0.ebuild |
| 89 |
@@ -28,8 +28,11 @@ RESTRICT="test" |
| 90 |
|
| 91 |
# TODO: Could make pkgconfig conditional on selinux? bug #782829 |
| 92 |
RDEPEND=" |
| 93 |
- virtual/libcrypt:= |
| 94 |
- !static? ( selinux? ( sys-libs/libselinux ) ) |
| 95 |
+ !static? ( |
| 96 |
+ virtual/libc |
| 97 |
+ virtual/libcrypt:= |
| 98 |
+ selinux? ( sys-libs/libselinux ) |
| 99 |
+ ) |
| 100 |
pam? ( sys-libs/pam ) |
| 101 |
" |
| 102 |
DEPEND="${RDEPEND} |
| 103 |
|
| 104 |
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild |
| 105 |
index 5e059850212f..6450127bf54b 100644 |
| 106 |
--- a/sys-apps/busybox/busybox-9999.ebuild |
| 107 |
+++ b/sys-apps/busybox/busybox-9999.ebuild |
| 108 |
@@ -27,8 +27,11 @@ RESTRICT="test" |
| 109 |
|
| 110 |
# TODO: Could make pkgconfig conditional on selinux? bug #782829 |
| 111 |
RDEPEND=" |
| 112 |
- virtual/libcrypt:= |
| 113 |
- !static? ( selinux? ( sys-libs/libselinux ) ) |
| 114 |
+ !static? ( |
| 115 |
+ virtual/libc |
| 116 |
+ virtual/libcrypt:= |
| 117 |
+ selinux? ( sys-libs/libselinux ) |
| 118 |
+ ) |
| 119 |
pam? ( sys-libs/pam ) |
| 120 |
" |
| 121 |
DEPEND="${RDEPEND} |
Archives