commit:     54f9c1fafdc7a60435ef47b8a3c26459ced96256
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 17:09:36 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 17:10:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f9c1fa

net-libs/gnutls-3.8.7.1-r1: replace one gnulib hack for another (Solaris)

No longer need the previous hacks, but now need another to fix symbol
versioning problems.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild 
b/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild
index 74f6ffe49d3a..8dee2bec3d09 100644
--- a/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild
@@ -90,13 +90,6 @@ src_prepare() {
        # fails to compile in certain configurations
        sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
 
-       if [[ ${CHOST} == *-solaris* ]] ; then
-               # should be gone on next release, for gnulib memset_s breakage
-               append-cppflags -D__STDC_WANT_LIB_EXT1__=1
-               # alloca usage, similar
-               sed -i -e '$a#include <alloca.h>' config.h.in || die
-       fi
-
        # Use sane .so versioning on FreeBSD.
        #elibtoolize
 
@@ -156,6 +149,12 @@ multilib_src_configure() {
        )
 
        ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+
+       if [[ ${CHOST} == *-solaris* ]] ; then
+               # gnulib ends up defining its own pthread_mutexattr_gettype
+               # otherwise, which is causing versioning problems
+               echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >> config.h || 
die
+       fi
 }
 
 multilib_src_install_all() {

Reply via email to