diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2023-04-11 18:54:26 +0200 |
|---|---|---|
| committer |   Arthur Zamarin <arthurzam@gentoo.org> | 2023-04-20 21:41:12 +0300 |
| commit | 7afe6f8f3b1238cf44f62684aacd848a21ea4cc5 (patch) | |
| tree | 515e462ac3e214b0d39bb710ae11d250c6ae801c | |
| parent | pytest.plugin: blank line after EAPI declare in create_ebuild (diff) | |
| download | pkgcore-7afe6f8f3b1238cf44f62684aacd848a21ea4cc5.tar.gz pkgcore-7afe6f8f3b1238cf44f62684aacd848a21ea4cc5.tar.bz2 pkgcore-7afe6f8f3b1238cf44f62684aacd848a21ea4cc5.zip | |
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@gentoo.org>
Closes: https://github.com/pkgcore/pkgcore/pull/403
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
| -rw-r--r-- | data/lib/pkgcore/ebd/eapi/4/src_configure.bash | 2 | ||||
| -rw-r--r-- | data/lib/pkgcore/ebd/eapi/5/src_configure.bash | 2 | ||||
| -rw-r--r-- | 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 5f859526..fc81c6f0 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 5d3c9c39..1ee56bb7 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 1ff999c6..d500b420 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 } |