commit:     c68d4a1625d2b8dd5c28c2c510514af8173ebfbc
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  3 13:54:52 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jul  3 14:01:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68d4a16

sys-apps/util-linux: pass --enable-fs-paths-extra always

Bug: https://bugs.gentoo.org/689190
Package-Manager: Portage-2.3.67_p17_p668925, Repoman-2.3.16_p1_p668925
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/util-linux/util-linux-2.34-r2.ebuild | 8 +++++++-
 sys-apps/util-linux/util-linux-9999.ebuild    | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys-apps/util-linux/util-linux-2.34-r2.ebuild 
b/sys-apps/util-linux/util-linux-2.34-r2.ebuild
index 2b00a2ad6fa..89fd6458e7b 100644
--- a/sys-apps/util-linux/util-linux-2.34-r2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.34-r2.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)

diff --git a/sys-apps/util-linux/util-linux-9999.ebuild 
b/sys-apps/util-linux/util-linux-9999.ebuild
index b15e6ad1a43..ef3a8b6b324 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)

Reply via email to