commit: 7afe6f8f3b1238cf44f62684aacd848a21ea4cc5 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Apr 11 16:54:26 2023 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Thu Apr 20 18:41:12 2023 +0000 URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=7afe6f8f
econf matches configure --help output better Check for proper end of string for all option names beginning with "with-", "disable-" or "enable-". This mainly affects --with-sysroot, where false positives have been observed. This follows this retroactive change in PMS: https://gitweb.gentoo.org/proj/pms.git/commit/?id=0e311ca4ac75be6ebea2a0b3c1b46f4daac75190 which was approved by the Gentoo Council in its 2023-04-09 meeting. Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> Closes: https://github.com/pkgcore/pkgcore/pull/403 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> data/lib/pkgcore/ebd/eapi/4/src_configure.bash | 2 +- data/lib/pkgcore/ebd/eapi/5/src_configure.bash | 2 +- data/lib/pkgcore/ebd/eapi/7/src_configure.bash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/lib/pkgcore/ebd/eapi/4/src_configure.bash b/data/lib/pkgcore/ebd/eapi/4/src_configure.bash index 5f859526a..fc81c6f03 100644 --- a/data/lib/pkgcore/ebd/eapi/4/src_configure.bash +++ b/data/lib/pkgcore/ebd/eapi/4/src_configure.bash @@ -1,5 +1,5 @@ __econf_options_eapi4() { - if [[ $1 == *"--disable-dependency-tracking"* ]]; then + if [[ $1 == *--disable-dependency-tracking[^A-Za-z0-9+_.-]* ]]; then echo --disable-dependency-tracking fi } diff --git a/data/lib/pkgcore/ebd/eapi/5/src_configure.bash b/data/lib/pkgcore/ebd/eapi/5/src_configure.bash index 5d3c9c390..1ee56bb7f 100644 --- a/data/lib/pkgcore/ebd/eapi/5/src_configure.bash +++ b/data/lib/pkgcore/ebd/eapi/5/src_configure.bash @@ -1,5 +1,5 @@ __econf_options_eapi5() { - if [[ $1 == *"--disable-silent-rules"* ]]; then + if [[ $1 == *--disable-silent-rules[^A-Za-z0-9+_.-]* ]]; then echo --disable-silent-rules fi } diff --git a/data/lib/pkgcore/ebd/eapi/7/src_configure.bash b/data/lib/pkgcore/ebd/eapi/7/src_configure.bash index 1ff999c65..d500b4202 100644 --- a/data/lib/pkgcore/ebd/eapi/7/src_configure.bash +++ b/data/lib/pkgcore/ebd/eapi/7/src_configure.bash @@ -1,5 +1,5 @@ __econf_options_eapi7() { - if [[ $1 == *"--with-sysroot"* ]]; then + if [[ $1 == *--with-sysroot[^A-Za-z0-9+_.-]* ]]; then echo --with-sysroot="${ESYSROOT:-/}" fi }
