[gentoo-commits] proj/pkgcore/pkgcore:master commit in: data/lib/pkgcore/ebd/eapi/8/

[gentoo-commits] proj/pkgcore/pkgcore:master commit in: data/lib/pkgcore/ebd/eapi/8/

[Arthur Zamarin]

commit:     52c15d2fc8ccb10b07c9172da69f9de459ee91b7
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 19:37:16 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 19:38:55 2022 +0000
URL:        https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=52c15d2f

Make EAPI 8 `--disable-static` logic libtool-specific

* The intention has always been to only target `configure` scripts that use
  libtool, not just any script with a `--disable-static*` option.

* libtool has been using the same `configure` format for at least
  the past 15 years (going back to libtool 1.5.22):

  1. shared and static libraries enabled (the main use case):
       --enable-shared[=PKGS]  build shared libraries [default=yes]
       --enable-static[=PKGS]  build static libraries [default=yes]

  2. shared libraries enabled and static libraries disabled:
       --enable-static[=PKGS]  build static libraries [default=no]
       --enable-shared[=PKGS]  build shared libraries [default=yes]

  3. shared libraries disabled and static libraries enabled:
       --enable-shared[=PKGS]  build shared libraries [default=no]
       --enable-static[=PKGS]  build static libraries [default=yes]

Bug: https://bugs.gentoo.org/814380
Signed-off-by: David Seifert <soap <AT> gentoo.org>
Closes: https://github.com/pkgcore/pkgcore/pull/386
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 data/lib/pkgcore/ebd/eapi/8/src_configure.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/lib/pkgcore/ebd/eapi/8/src_configure.bash b/data/lib/pkgcore/ebd/eapi/8/src_configure.bash
index ed94b52bf..85a51d181 100644
--- a/data/lib/pkgcore/ebd/eapi/8/src_configure.bash
+++ b/data/lib/pkgcore/ebd/eapi/8/src_configure.bash
@@ -2,7 +2,7 @@ __econf_options_eapi8() {
 	if [[ $1 == *"--datarootdir"* ]]; then
 		echo "--datarootdir=${EPREFIX}/usr/share"
 	fi
-	if [[ $1 == *"--disable-static"* || $1 == *"--enable-static"* ]]; then
+	if [[ $1 == *--enable-shared[^A-Za-z0-9+_.-]* && $1 == *--enable-static[^A-Za-z0-9+_.-]* ]]; then
 		echo "--disable-static"
 	fi
 }