diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-07-10 23:40:16 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-07-10 23:40:16 +0100 |
commit | 51af5f0eb4cddbe6aa7953717873691d77aae9ff (patch) | |
tree | 1541525274162b033ebbc3ed38abaf335fbbd49a /sys-apps/util-linux/util-linux-9999.ebuild | |
parent | 7014a5a3ea0feffab9701fdd6b64cc7667a985af (diff) |
gentoo resync : 11.07.2019
Diffstat (limited to 'sys-apps/util-linux/util-linux-9999.ebuild')
-rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index efc59ae73575..89fd6458e7b2 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -109,6 +109,7 @@ lfs_fallocate_test() { python_configure() { local myeconfargs=( + "${commonargs[@]}" --disable-all-programs --disable-bash-completion --without-systemdsystemunitdir @@ -136,8 +137,13 @@ multilib_src_configure() { export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - local myeconfargs=( + # configure args shared by python and non-python builds + local commonargs=( --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + ) + + local myeconfargs=( + "${commonargs[@]}" --with-bashcompletiondir="$(get_bashcompdir)" --without-python $(multilib_native_use_enable suid makeinstall-chown) @@ -241,16 +247,17 @@ python_install() { } multilib_src_install() { + if multilib_is_native_abi && use python; then + python_foreach_impl python_install + fi + + # This needs to be called AFTER python_install call (#689190) emake DESTDIR="${D}" install if multilib_is_native_abi && use userland_GNU; then # need the libs in / gen_usr_ldscript -a blkid fdisk mount smartcols uuid fi - - if multilib_is_native_abi && use python; then - python_foreach_impl python_install - fi } multilib_src_install_all() { |