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 57E4F15808B for ; Tue, 29 Mar 2022 02:00:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5504CE0882; Tue, 29 Mar 2022 02:00:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 E4261E0882 for ; Tue, 29 Mar 2022 02:00:54 +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 6E9AC34142C for ; Tue, 29 Mar 2022 02:00:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D49B177 for ; Tue, 29 Mar 2022 02:00:50 +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: <1648519240.cd0a0f16ebdc4cf2d18378213d8476aeb42ff810.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/, sys-libs/zlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch sys-libs/zlib/zlib-1.2.12-r1.ebuild X-VCS-Directories: sys-libs/zlib/ sys-libs/zlib/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cd0a0f16ebdc4cf2d18378213d8476aeb42ff810 X-VCS-Branch: master Date: Tue, 29 Mar 2022 02:00:50 +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: a8e8d705-ea9d-4240-9f3e-aa277bff9327 X-Archives-Hash: 7ac09604c128ccf89932dacdf9d9e4e7 commit: cd0a0f16ebdc4cf2d18378213d8476aeb42ff810 Author: Sam James gentoo org> AuthorDate: Tue Mar 29 01:59:47 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 29 02:00:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd0a0f16 sys-libs/zlib: keyword 1.2.12-r1 Issues are fixed now. Nothing else has come up other than the now-fixed CC-configure issue. Bug: https://bugs.gentoo.org/835958 Signed-off-by: Sam James gentoo.org> sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch | 6 ++++-- sys-libs/zlib/zlib-1.2.12-r1.ebuild | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch b/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch index 8b6c5e26a766..7fb13325b114 100644 --- a/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch +++ b/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch @@ -1,6 +1,6 @@ https://github.com/madler/zlib/pull/607 -From c9b7587ff947638412a69df5ea820c563b8b1c1b Mon Sep 17 00:00:00 2001 +From 80d086357a55b94a13e43756cf3e131f25eef0e4 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 28 Mar 2022 08:40:45 +0100 Subject: [PATCH] Fix CC logic in configure @@ -10,6 +10,9 @@ the logic was changed to try check harder for GCC, but it dropped the default setting of cc=${CC}. It was throwing away any pre-set CC value as a result. +The rest of the script then cascades down a bad path because it's convinced +it's not GCC or a GCC-like compiler. + This led to e.g. misdetection of inability to build shared libs for say, multilib cases (w/ CC being one thing from the environment being used for one test (e.g. x86_64-unknown-linux-gnu-gcc -m32 and then 'cc' used for @@ -40,4 +43,3 @@ index 52ff4a04e..3fa3e8618 100755 cflags=${CFLAGS-"-O3"} # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure case "$cc" in - diff --git a/sys-libs/zlib/zlib-1.2.12-r1.ebuild b/sys-libs/zlib/zlib-1.2.12-r1.ebuild index 1a031b3c2526..267b24c0d148 100644 --- a/sys-libs/zlib/zlib-1.2.12-r1.ebuild +++ b/sys-libs/zlib/zlib-1.2.12-r1.ebuild @@ -22,7 +22,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]"