From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 40273158020 for ; Wed, 30 Nov 2022 22:29:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56030E07D3; Wed, 30 Nov 2022 22:29:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3DC26E07D3 for ; Wed, 30 Nov 2022 22:29:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35B65340F3E for ; Wed, 30 Nov 2022 22:29:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D81E76D for ; Wed, 30 Nov 2022 22:29:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1669847338.669b3d757cd287e193c04f910b5ebc8b74ad35b7.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/, / X-VCS-Repository: proj/portage X-VCS-Files: NEWS bin/phase-helpers.sh X-VCS-Directories: / bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 669b3d757cd287e193c04f910b5ebc8b74ad35b7 X-VCS-Branch: master Date: Wed, 30 Nov 2022 22:29:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f10fbf77-aca6-4ea6-a356-d9d659031f30 X-Archives-Hash: b6d6b8c0c7897fee59a94271242391e9 commit: 669b3d757cd287e193c04f910b5ebc8b74ad35b7 Author: David Seifert gentoo org> AuthorDate: Wed Nov 30 11:24:49 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 30 22:28:58 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=669b3d75 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 gentoo.org> Closes: https://github.com/gentoo/portage/pull/936 Signed-off-by: Sam James gentoo.org> NEWS | 4 ++++ bin/phase-helpers.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 57d9c92ee..923b95a43 100644 --- a/NEWS +++ b/NEWS @@ -49,6 +49,10 @@ Bug fixes: * env-update: Also generate PATH definition in systemd user environment file /etc/environment.d/10-gentoo-env.conf +* --disable-static is only passed for libtool-enabled configure scripts in EAPI 8. + This avoids annoying warnings when a configure script has a flag such as + --disable-static_link that would then trigger a QA warning (bug #814380). + portage-3.0.39 (2022-11-20) -------------- diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 2217e5a0b..a0fe599fd 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -655,8 +655,8 @@ econf() { fi if ___eapi_econf_passes_--disable-static; then - if [[ ${conf_help} == *--disable-static* || \ - ${conf_help} == *--enable-static* ]]; then + if [[ ${conf_help} == *--enable-shared[^A-Za-z0-9+_.-]* && + ${conf_help} == *--enable-static[^A-Za-z0-9+_.-]* ]]; then conf_args+=( --disable-static ) fi fi