[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/, www-servers/nginx-unit/files/

[Mike Pagano]

commit:     69589f3c571a1c6e934824403b281cc8c5d0d2ca
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 13 18:21:46 2021 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 18:21:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69589f3c

www-servers/nginx-unit: Patch for glibc 2.34 support

Closes: https://bugs.gentoo.org/812467
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 .../files/nginx-unit-1.25.0-glibc-2.34.patch       | 22 ++++++++++++++++++++++
 www-servers/nginx-unit/nginx-unit-1.25.0.ebuild    |  6 +++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/www-servers/nginx-unit/files/nginx-unit-1.25.0-glibc-2.34.patch b/www-servers/nginx-unit/files/nginx-unit-1.25.0-glibc-2.34.patch
new file mode 100644
index 00000000000..c2f5165402a
--- /dev/null
+++ b/www-servers/nginx-unit/files/nginx-unit-1.25.0-glibc-2.34.patch
@@ -0,0 +1,22 @@
+From 0125873b1dfbe6e671e3c9874ec2653f1b7832fa Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@××××××××.net>
+Date: Fri, 3 Sep 2021 18:03:38 +0200
+Subject: [PATCH] fix build with recent glibc
+
+---
+ src/nxt_thread.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nxt_thread.h b/src/nxt_thread.h
+index d7800cc6..36e74cde 100644
+--- a/src/nxt_thread.h
++++ b/src/nxt_thread.h
+@@ -142,7 +142,7 @@ nxt_thread_yield()                                                            \
+ #endif
+ 
+ 
+-#if (PTHREAD_STACK_MIN)
++#if defined(PTHREAD_STACK_MIN)
+ #define NXT_THREAD_STACK_MIN  PTHREAD_STACK_MIN
+ 
+ #else

diff --git a/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild
index 5a6de36e3bf..b4fa47193ab 100644
--- a/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild
@@ -30,9 +30,12 @@ DEPEND="perl? ( dev-lang/perl:= )
 		dev-lang/ruby:*
 		dev-ruby/rubygems:*
 	)
-	ssl? ( dev-libs/openssl:0= )"
+	ssl? ( dev-libs/openssl:0= )
+	virtual/libcrypt:0="
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-glibc-2.34.patch )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -40,6 +43,7 @@ pkg_setup() {
 src_prepare() {
 	eapply_user
 	sed -i '/^CFLAGS/d' auto/make || die
+	default
 }
 
 src_configure() {