commit:     1c077c1f373119e25e4522d7952e34283e3b5be2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 06:54:58 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> 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 <grobian <AT> 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.

Reply via email to