commit: 1c76376ce6ddd5fa26c30de8de00afd775b013f1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Mar 26 22:55:01 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 26 23:03:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c76376c
dev-build/libtool: don't hardcode path to grep & friends Closes: https://bugs.gentoo.org/927837 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libtool/{libtool-2.4.7-r3.ebuild => libtool-2.4.7-r4.ebuild} | 8 ++++++-- dev-build/libtool/libtool-9999.ebuild | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev-build/libtool/libtool-2.4.7-r3.ebuild b/dev-build/libtool/libtool-2.4.7-r4.ebuild similarity index 92% rename from dev-build/libtool/libtool-2.4.7-r3.ebuild rename to dev-build/libtool/libtool-2.4.7-r4.ebuild index 75bdf19f6d2a..d165475452d8 100644 --- a/dev-build/libtool/libtool-2.4.7-r3.ebuild +++ b/dev-build/libtool/libtool-2.4.7-r4.ebuild @@ -98,11 +98,15 @@ src_configure() { # to find a bash shell. if /bin/sh is bash, it uses that. this can # cause problems for people who switch /bin/sh on the fly to other # shells, so just force libtool to use /bin/bash all the time. - export CONFIG_SHELL="${EPREFIX}"/bin/bash - # Do not bother hardcoding the full path to sed. # Just rely on $PATH. bug #574550 + export CONFIG_SHELL="${EPREFIX}"/bin/bash export ac_cv_path_SED="$(basename "$(type -P sed)")" + export ac_cv_path_EGREP="$(basename "$(type -P grep)") -E" + export ac_cv_path_EGREP_TRADITIONAL="$(basename "$(type -P grep)") -E" + export ac_cv_path_FGREP="$(basename "$(type -P grep)") -F" + export ac_cv_path_GREP="$(basename "$(type -P grep)")" + export ac_cv_path_lt_DD="$(basename "$(type -P dd)")" [[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g" diff --git a/dev-build/libtool/libtool-9999.ebuild b/dev-build/libtool/libtool-9999.ebuild index 033495d8ee02..f25c4861a85e 100644 --- a/dev-build/libtool/libtool-9999.ebuild +++ b/dev-build/libtool/libtool-9999.ebuild @@ -96,11 +96,15 @@ src_configure() { # to find a bash shell. if /bin/sh is bash, it uses that. this can # cause problems for people who switch /bin/sh on the fly to other # shells, so just force libtool to use /bin/bash all the time. - export CONFIG_SHELL="${EPREFIX}"/bin/bash - # Do not bother hardcoding the full path to sed. # Just rely on $PATH. bug #574550 + export CONFIG_SHELL="${EPREFIX}"/bin/bash export ac_cv_path_SED="$(basename "$(type -P sed)")" + export ac_cv_path_EGREP="$(basename "$(type -P grep)") -E" + export ac_cv_path_EGREP_TRADITIONAL="$(basename "$(type -P grep)") -E" + export ac_cv_path_FGREP="$(basename "$(type -P grep)") -F" + export ac_cv_path_GREP="$(basename "$(type -P grep)")" + export ac_cv_path_lt_DD="$(basename "$(type -P dd)")" [[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
