| 1 |
commit: 930bbd8d0e7c306fad4295df08788a8ecbf749f0 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 6 07:22:26 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 6 11:43:21 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930bbd8d |
| 7 |
|
| 8 |
sys-apps/util-linux: Explicitly disable all programs for non-native |
| 9 |
|
| 10 |
Explicitly pass --disable-all-programs for non-native builds. While |
| 11 |
this isn't strictly necessary with the hack we're doing for compile, |
| 12 |
it will be helpful in a followup commit introducing FreeBSD support. |
| 13 |
|
| 14 |
sys-apps/util-linux/util-linux-9999.ebuild | 56 +++++++++++++++++++----------- |
| 15 |
1 file changed, 36 insertions(+), 20 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild |
| 18 |
index 7f083538327..b36fbd03cc3 100644 |
| 19 |
--- a/sys-apps/util-linux/util-linux-9999.ebuild |
| 20 |
+++ b/sys-apps/util-linux/util-linux-9999.ebuild |
| 21 |
@@ -110,30 +110,11 @@ multilib_src_configure() { |
| 22 |
export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 |
| 23 |
|
| 24 |
local myeconfargs=( |
| 25 |
- --disable-chfn-chsh |
| 26 |
- --disable-login |
| 27 |
- --disable-nologin |
| 28 |
- --disable-su |
| 29 |
- --enable-agetty |
| 30 |
- --enable-bash-completion |
| 31 |
--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" |
| 32 |
- --enable-line |
| 33 |
- --enable-partx |
| 34 |
- --enable-raw |
| 35 |
- --enable-rename |
| 36 |
- --enable-rfkill |
| 37 |
- --enable-schedutils |
| 38 |
--with-bashcompletiondir="$(get_bashcompdir)" |
| 39 |
- --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no") |
| 40 |
- $(multilib_native_use_enable caps setpriv) |
| 41 |
- $(multilib_native_use_enable cramfs) |
| 42 |
- $(multilib_native_use_enable fdformat) |
| 43 |
$(multilib_native_use_enable nls) |
| 44 |
$(multilib_native_use_enable suid makeinstall-chown) |
| 45 |
$(multilib_native_use_enable suid makeinstall-setuid) |
| 46 |
- $(multilib_native_use_enable tty-helpers mesg) |
| 47 |
- $(multilib_native_use_enable tty-helpers wall) |
| 48 |
- $(multilib_native_use_enable tty-helpers write) |
| 49 |
$(multilib_native_use_with python) |
| 50 |
$(multilib_native_use_with readline) |
| 51 |
$(multilib_native_use_with slang) |
| 52 |
@@ -143,11 +124,46 @@ multilib_src_configure() { |
| 53 |
$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') |
| 54 |
$(tc-has-tls || echo --disable-tls) |
| 55 |
$(use_enable unicode widechar) |
| 56 |
- $(use_enable kill) |
| 57 |
$(use_enable static-libs static) |
| 58 |
$(use_with selinux) |
| 59 |
$(usex ncurses '' '--without-tinfo') |
| 60 |
) |
| 61 |
+ if multilib_is_native_abi; then |
| 62 |
+ myeconfargs+=( |
| 63 |
+ --disable-chfn-chsh |
| 64 |
+ --disable-login |
| 65 |
+ --disable-nologin |
| 66 |
+ --disable-su |
| 67 |
+ --enable-agetty |
| 68 |
+ --enable-bash-completion |
| 69 |
+ --enable-line |
| 70 |
+ --enable-partx |
| 71 |
+ --enable-raw |
| 72 |
+ --enable-rename |
| 73 |
+ --enable-rfkill |
| 74 |
+ --enable-schedutils |
| 75 |
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
| 76 |
+ $(use_enable caps setpriv) |
| 77 |
+ $(use_enable cramfs) |
| 78 |
+ $(use_enable fdformat) |
| 79 |
+ $(use_enable tty-helpers mesg) |
| 80 |
+ $(use_enable tty-helpers wall) |
| 81 |
+ $(use_enable tty-helpers write) |
| 82 |
+ $(use_enable kill) |
| 83 |
+ ) |
| 84 |
+ else |
| 85 |
+ myeconfargs+=( |
| 86 |
+ --disable-all-programs |
| 87 |
+ --disable-bash-completion |
| 88 |
+ --without-systemdsystemunitdir |
| 89 |
+ # build all libraries |
| 90 |
+ --enable-libuuid |
| 91 |
+ --enable-libblkid |
| 92 |
+ --enable-libmount |
| 93 |
+ --enable-libsmartcols |
| 94 |
+ --enable-libfdisk |
| 95 |
+ ) |
| 96 |
+ fi |
| 97 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 98 |
} |
Archives