From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F0C9E138331 for ; Fri, 6 Apr 2018 11:44:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AF34E08CA; Fri, 6 Apr 2018 11:44:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB058E08CA for ; Fri, 6 Apr 2018 11:44:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C73A1335C4A for ; Fri, 6 Apr 2018 11:44:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D4F526E for ; Fri, 6 Apr 2018 11:44:17 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1523015001.930bbd8d0e7c306fad4295df08788a8ecbf749f0.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/util-linux-9999.ebuild X-VCS-Directories: sys-apps/util-linux/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 930bbd8d0e7c306fad4295df08788a8ecbf749f0 X-VCS-Branch: master Date: Fri, 6 Apr 2018 11:44:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4c762282-1251-4f0e-82d2-cde6c1333eac X-Archives-Hash: 17dae6826d9e17566fdc44e02630027c commit: 930bbd8d0e7c306fad4295df08788a8ecbf749f0 Author: Michał Górny gentoo org> AuthorDate: Fri Apr 6 07:22:26 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Apr 6 11:43:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930bbd8d sys-apps/util-linux: Explicitly disable all programs for non-native Explicitly pass --disable-all-programs for non-native builds. While this isn't strictly necessary with the hack we're doing for compile, it will be helpful in a followup commit introducing FreeBSD support. sys-apps/util-linux/util-linux-9999.ebuild | 56 +++++++++++++++++++----------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 7f083538327..b36fbd03cc3 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -110,30 +110,11 @@ multilib_src_configure() { export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 local myeconfargs=( - --disable-chfn-chsh - --disable-login - --disable-nologin - --disable-su - --enable-agetty - --enable-bash-completion --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - --enable-line - --enable-partx - --enable-raw - --enable-rename - --enable-rfkill - --enable-schedutils --with-bashcompletiondir="$(get_bashcompdir)" - --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no") - $(multilib_native_use_enable caps setpriv) - $(multilib_native_use_enable cramfs) - $(multilib_native_use_enable fdformat) $(multilib_native_use_enable nls) $(multilib_native_use_enable suid makeinstall-chown) $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_enable tty-helpers mesg) - $(multilib_native_use_enable tty-helpers wall) - $(multilib_native_use_enable tty-helpers write) $(multilib_native_use_with python) $(multilib_native_use_with readline) $(multilib_native_use_with slang) @@ -143,11 +124,46 @@ multilib_src_configure() { $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') $(tc-has-tls || echo --disable-tls) $(use_enable unicode widechar) - $(use_enable kill) $(use_enable static-libs static) $(use_with selinux) $(usex ncurses '' '--without-tinfo') ) + if multilib_is_native_abi; then + myeconfargs+=( + --disable-chfn-chsh + --disable-login + --disable-nologin + --disable-su + --enable-agetty + --enable-bash-completion + --enable-line + --enable-partx + --enable-raw + --enable-rename + --enable-rfkill + --enable-schedutils + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable caps setpriv) + $(use_enable cramfs) + $(use_enable fdformat) + $(use_enable tty-helpers mesg) + $(use_enable tty-helpers wall) + $(use_enable tty-helpers write) + $(use_enable kill) + ) + else + myeconfargs+=( + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + # build all libraries + --enable-libuuid + --enable-libblkid + --enable-libmount + --enable-libsmartcols + --enable-libfdisk + ) + fi ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" }