commit: c84572164618637ab7528a9a95946b6bc39d0eb5 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Fri Jan 10 11:21:32 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Jan 10 11:21:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8457216
sys-apps/util-linux: Fixed cross-compilation Closes: https://bugs.gentoo.org/654034 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-apps/util-linux/util-linux-2.33.2.ebuild | 10 ++++------ sys-apps/util-linux/util-linux-2.34-r3.ebuild | 10 ++++------ sys-apps/util-linux/util-linux-2.35_rc2.ebuild | 10 ++++------ sys-apps/util-linux/util-linux-9999.ebuild | 10 ++++------ 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild index 1a720970cc0..8e0e60b9c32 100644 --- a/sys-apps/util-linux/util-linux-2.33.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild @@ -92,12 +92,6 @@ src_prepare() { eautoreconf fi - # Undo bad ncurses handling by upstream. #601530 - sed -i -E \ - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \ - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \ - configure || die - elibtoolize } @@ -143,6 +137,10 @@ 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 + # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 + export NCURSES6_CONFIG=false NCURSES5_CONFIG=false + export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false + local myeconfargs=( --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" --with-bashcompletiondir="$(get_bashcompdir)" diff --git a/sys-apps/util-linux/util-linux-2.34-r3.ebuild b/sys-apps/util-linux/util-linux-2.34-r3.ebuild index 69560039913..18ce2051063 100644 --- a/sys-apps/util-linux/util-linux-2.34-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.34-r3.ebuild @@ -91,12 +91,6 @@ src_prepare() { eautoreconf fi - # Undo bad ncurses handling by upstream. #601530 - sed -i -E \ - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \ - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \ - configure || die - elibtoolize } @@ -143,6 +137,10 @@ 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 + # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 + export NCURSES6_CONFIG=false NCURSES5_CONFIG=false + export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false + # configure args shared by python and non-python builds local commonargs=( --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" diff --git a/sys-apps/util-linux/util-linux-2.35_rc2.ebuild b/sys-apps/util-linux/util-linux-2.35_rc2.ebuild index cfaef772324..f1759d4eb6c 100644 --- a/sys-apps/util-linux/util-linux-2.35_rc2.ebuild +++ b/sys-apps/util-linux/util-linux-2.35_rc2.ebuild @@ -92,12 +92,6 @@ src_prepare() { eautoreconf fi - # Undo bad ncurses handling by upstream. #601530 - sed -i -E \ - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \ - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \ - configure || die - elibtoolize } @@ -144,6 +138,10 @@ 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 + # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 + export NCURSES6_CONFIG=false NCURSES5_CONFIG=false + export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false + # configure args shared by python and non-python builds local commonargs=( --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index cfaef772324..f1759d4eb6c 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -92,12 +92,6 @@ src_prepare() { eautoreconf fi - # Undo bad ncurses handling by upstream. #601530 - sed -i -E \ - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \ - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \ - configure || die - elibtoolize } @@ -144,6 +138,10 @@ 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 + # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 + export NCURSES6_CONFIG=false NCURSES5_CONFIG=false + export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false + # configure args shared by python and non-python builds local commonargs=( --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
