public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Arthur Zamarin" <arthurzam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/pkgcore/pkgcore:master commit in: data/lib/pkgcore/ebd/eapi/8/
Date: Sun, 25 Dec 2022 19:39:46 +0000 (UTC)	[thread overview]
Message-ID: <1671997135.52c15d2fc8ccb10b07c9172da69f9de459ee91b7.arthurzam@gentoo> (raw)

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
 }


                 reply	other threads:[~2022-12-25 19:39 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1671997135.52c15d2fc8ccb10b07c9172da69f9de459ee91b7.arthurzam@gentoo \
    --to=arthurzam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox