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 5B0F215806E for ; Fri, 26 May 2023 06:56:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93573E07FE; Fri, 26 May 2023 06:56:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 785B5E07FE for ; Fri, 26 May 2023 06:56:25 +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 8896233BE3F for ; Fri, 26 May 2023 06:56:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4F31A67 for ; Fri, 26 May 2023 06:56:22 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1685084098.1c077c1f373119e25e4522d7952e34283e3b5be2.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libxml2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libxml2/libxml2-2.11.4.ebuild dev-libs/libxml2/libxml2-9999.ebuild X-VCS-Directories: dev-libs/libxml2/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 1c077c1f373119e25e4522d7952e34283e3b5be2 X-VCS-Branch: master Date: Fri, 26 May 2023 06:56:22 +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: c17f5785-f146-4c4f-9208-ceadc76cb60a X-Archives-Hash: 0c2e86925e65f72645ed3108bd46a88b commit: 1c077c1f373119e25e4522d7952e34283e3b5be2 Author: Fabian Groffen gentoo org> AuthorDate: Fri May 26 06:54:58 2023 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri May 26 06:54:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c077c1f dev-libs/libxml2: fixup for Solaris build-fix - add missing virtual/libiconv dependency - add note + bugref for Solaris workaround - remove workaround from live-ebuild, since a fix was applied upstream Closes: https://bugs.gentoo.org/735134 Signed-off-by: Fabian Groffen gentoo.org> dev-libs/libxml2/libxml2-2.11.4.ebuild | 3 +++ dev-libs/libxml2/libxml2-9999.ebuild | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-libs/libxml2/libxml2-2.11.4.ebuild b/dev-libs/libxml2/libxml2-2.11.4.ebuild index a2dcc7cd93c0..e2b87b99d880 100644 --- a/dev-libs/libxml2/libxml2-2.11.4.ebuild +++ b/dev-libs/libxml2/libxml2-2.11.4.ebuild @@ -42,6 +42,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" + virtual/libiconv >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) @@ -101,6 +102,8 @@ multilib_src_configure() { # Filter seemingly problematic CFLAGS (bug #26320) filter-flags -fprefetch-loop-arrays -funroll-loops + # Workaround for too simplistic iconv check already addressed + # upstream (bug #907065), should be dropped on next release. if [[ ${CHOST} == *-solaris* ]] ; then append-libs iconv fi diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild index a2dcc7cd93c0..23465b596258 100644 --- a/dev-libs/libxml2/libxml2-9999.ebuild +++ b/dev-libs/libxml2/libxml2-9999.ebuild @@ -42,6 +42,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" + virtual/libiconv >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) @@ -101,10 +102,6 @@ multilib_src_configure() { # Filter seemingly problematic CFLAGS (bug #26320) filter-flags -fprefetch-loop-arrays -funroll-loops - if [[ ${CHOST} == *-solaris* ]] ; then - append-libs iconv - fi - # Notes: # The meaning of the 'debug' USE flag does not apply to the --with-debug # switch (enabling the libxml2 debug module). See bug #100898.