commit: a0ff82d513b952a0cd7764ffe8958806499c981d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 5 10:52:56 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Dec 5 10:54:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ff82d5
sys-apps/util-linux: Cut dependency loop in stage1 build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
...-2.38.1-r2.ebuild => util-linux-2.38.1-r3.ebuild} | 20 ++++++++++++++++----
...nux-2.39.2.ebuild => util-linux-2.39.2-r1.ebuild} | 20 ++++++++++++++++----
...nux-2.39.3.ebuild => util-linux-2.39.3-r1.ebuild} | 20 ++++++++++++++++----
3 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild
b/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild
similarity index 97%
rename from sys-apps/util-linux/util-linux-2.38.1-r2.ebuild
rename to sys-apps/util-linux/util-linux-2.38.1-r3.ebuild
index 48a7610afb48..dd3d6ec43259 100644
--- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild
@@ -55,8 +55,10 @@ RDEPEND="
rtas? ( sys-libs/librtas )
selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
slang? ( sys-libs/slang )
- !build? ( systemd? ( sys-apps/systemd ) )
- udev? ( virtual/libudev:= )"
+ !build? (
+ systemd? ( sys-apps/systemd )
+ udev? ( virtual/libudev:= )
+ )"
BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
@@ -207,8 +209,6 @@ multilib_src_configure() {
$(multilib_native_use_enable suid makeinstall-setuid)
$(multilib_native_use_with readline)
$(multilib_native_use_with slang)
- $(multilib_native_use_with systemd)
- $(multilib_native_use_with udev)
$(multilib_native_usex ncurses "$(use_with magic libmagic)"
'--without-libmagic')
$(multilib_native_usex ncurses "$(use_with unicode ncursesw)"
'--without-ncursesw')
$(multilib_native_usex ncurses "$(use_with !unicode ncurses)"
'--without-ncurses')
@@ -221,6 +221,18 @@ multilib_src_configure() {
$(use_with selinux)
)
+ if use build ; then
+ myeconfargs+=(
+ --without-systemd
+ --without-udev
+ )
+ else
+ myeconfargs+=(
+ $(multilib_native_use_with systemd)
+ $(multilib_native_use_with udev)
+ )
+ fi
+
if multilib_is_native_abi ; then
myeconfargs+=(
--disable-chfn-chsh
diff --git a/sys-apps/util-linux/util-linux-2.39.2.ebuild
b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild
similarity index 97%
rename from sys-apps/util-linux/util-linux-2.39.2.ebuild
rename to sys-apps/util-linux/util-linux-2.39.2-r1.ebuild
index 1996b460e1b3..f1a98bd3395c 100644
--- a/sys-apps/util-linux/util-linux-2.39.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild
@@ -55,8 +55,10 @@ RDEPEND="
rtas? ( sys-libs/librtas )
selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
slang? ( sys-libs/slang )
- !build? ( systemd? ( sys-apps/systemd ) )
- udev? ( virtual/libudev:= )
+ !build? (
+ systemd? ( sys-apps/systemd )
+ udev? ( virtual/libudev:= )
+ )
"
BDEPEND="
virtual/pkgconfig
@@ -220,8 +222,6 @@ multilib_src_configure() {
$(multilib_native_use_enable suid makeinstall-setuid)
$(multilib_native_use_with readline)
$(multilib_native_use_with slang)
- $(multilib_native_use_with systemd)
- $(multilib_native_use_with udev)
$(multilib_native_usex ncurses "$(use_with magic libmagic)"
'--without-libmagic')
$(multilib_native_usex ncurses "$(use_with unicode ncursesw)"
'--without-ncursesw')
$(multilib_native_usex ncurses "$(use_with !unicode ncurses)"
'--without-ncurses')
@@ -235,6 +235,18 @@ multilib_src_configure() {
$(use_with selinux)
)
+ if use build ; then
+ myeconfargs+=(
+ --without-systemd
+ --without-udev
+ )
+ else
+ myeconfargs+=(
+ $(multilib_native_use_with systemd)
+ $(multilib_native_use_with udev)
+ )
+ fi
+
if multilib_is_native_abi ; then
myeconfargs+=(
--disable-chfn-chsh
diff --git a/sys-apps/util-linux/util-linux-2.39.3.ebuild
b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild
similarity index 97%
rename from sys-apps/util-linux/util-linux-2.39.3.ebuild
rename to sys-apps/util-linux/util-linux-2.39.3-r1.ebuild
index 6655149f15a6..8c83d7e9c777 100644
--- a/sys-apps/util-linux/util-linux-2.39.3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild
@@ -55,8 +55,10 @@ RDEPEND="
rtas? ( sys-libs/librtas )
selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
slang? ( sys-libs/slang )
- !build? ( systemd? ( sys-apps/systemd ) )
- udev? ( virtual/libudev:= )
+ !build? (
+ systemd? ( sys-apps/systemd )
+ udev? ( virtual/libudev:= )
+ )
"
BDEPEND="
virtual/pkgconfig
@@ -220,8 +222,6 @@ multilib_src_configure() {
$(multilib_native_use_enable suid makeinstall-setuid)
$(multilib_native_use_with readline)
$(multilib_native_use_with slang)
- $(multilib_native_use_with systemd)
- $(multilib_native_use_with udev)
$(multilib_native_usex ncurses "$(use_with magic libmagic)"
'--without-libmagic')
$(multilib_native_usex ncurses "$(use_with unicode ncursesw)"
'--without-ncursesw')
$(multilib_native_usex ncurses "$(use_with !unicode ncurses)"
'--without-ncurses')
@@ -235,6 +235,18 @@ multilib_src_configure() {
$(use_with selinux)
)
+ if use build ; then
+ myeconfargs+=(
+ --without-systemd
+ --without-udev
+ )
+ else
+ myeconfargs+=(
+ $(multilib_native_use_with systemd)
+ $(multilib_native_use_with udev)
+ )
+ fi
+
if multilib_is_native_abi ; then
myeconfargs+=(
--disable-chfn-chsh
