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@gentoo.org>

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 2b00a2ad6fa2cca6b6c8395019c8205d3cdfd8a9..89fd6458e7b2c7d8c7f27140ae3a788aac489a23 100644 (file)
--- 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 b15e6ad1a438cd1bbf66bda8de9e4523418a5da1..ef3a8b6b3247256f2b9d0c0ae1c725f2549338b7 100644 (file)
--- 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)