From 2ac986ff313c3f9cb78e7ec0600625a21b86c59e Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 8 Apr 2024 07:11:54 +0000
Subject: [PATCH] dev-build/libtool: Sync with Gentoo

It's from Gentoo commit 411f7e106012a6af37a5d14e2a62572c2f0b4f6a.
---
 ...libtool-2.4.7-r3.ebuild => libtool-2.4.7-r4.ebuild} | 10 +++++++---
 .../dev-build/libtool/libtool-9999.ebuild              |  8 ++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)
 rename sdk_container/src/third_party/portage-stable/dev-build/libtool/{libtool-2.4.7-r3.ebuild => libtool-2.4.7-r4.ebuild} (94%)

diff --git a/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r4.ebuild
similarity index 94%
rename from sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r3.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r4.ebuild
index 75bdf19f6d..73de49e5d1 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/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 ac_cv_path_SED="$(basename "$(type -P sed)")"
+	export CONFIG_SHELL="${EPREFIX}"/bin/bash
+	export ac_cv_path_SED="sed"
+	export ac_cv_path_EGREP="grep -E"
+	export ac_cv_path_EGREP_TRADITIONAL="grep -E"
+	export ac_cv_path_FGREP="grep -F"
+	export ac_cv_path_GREP="grep"
+	export ac_cv_path_lt_DD="dd"
 
 	[[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-9999.ebuild
index 033495d8ee..f25c4861a8 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/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"