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 08EC11581C1 for ; Fri, 12 Jul 2024 10:29:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25490E2B3A; Fri, 12 Jul 2024 10:29:17 +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 4EEC0E2B39 for ; Fri, 12 Jul 2024 10:29:16 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E20734301D for ; Fri, 12 Jul 2024 10:29:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF7F51DB7 for ; Fri, 12 Jul 2024 10:29:13 +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: <1720780111.74eff9db04a287c732e2ca62c79a8322df53092d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild www-servers/lighttpd/lighttpd-1.4.76.ebuild X-VCS-Directories: www-servers/lighttpd/files/ www-servers/lighttpd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 74eff9db04a287c732e2ca62c79a8322df53092d X-VCS-Branch: master Date: Fri, 12 Jul 2024 10:29:13 +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: 03a5632b-fbe9-42c1-b470-24bef033f2ef X-Archives-Hash: 3ffe55cb4e07f0aeeeebd3654c15757b commit: 74eff9db04a287c732e2ca62c79a8322df53092d Author: Sam James gentoo org> AuthorDate: Fri Jul 12 10:27:59 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jul 12 10:28:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74eff9db www-servers/lighttpd: fix build on sparc for 1.4.76 I'd previously fixed 1.4.75 and assumed the fix was in 1.4.76. Closes: https://bugs.gentoo.org/935832 Bug: https://bugs.gentoo.org/931305 Signed-off-by: Sam James gentoo.org> .../lighttpd/files/lighttpd-1.4.76-sparc.patch | 111 +++++++++++++++++++++ www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild | 4 + www-servers/lighttpd/lighttpd-1.4.76.ebuild | 4 + 3 files changed, 119 insertions(+) diff --git a/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch b/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch new file mode 100644 index 000000000000..48568889a661 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd-1.4.76-sparc.patch @@ -0,0 +1,111 @@ +https://github.com/lighttpd/lighttpd1.4/commit/88ff3763dae65371eab9f8a22ac1c95c96fe4490 +https://github.com/lighttpd/lighttpd1.4/commit/524614455554163ec78b27b89ff52bbf7fe96958 + +From 88ff3763dae65371eab9f8a22ac1c95c96fe4490 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Tue, 23 Apr 2024 00:16:29 -0400 +Subject: [PATCH] Revert "[core] special value for Linux POLLRDHUP on SPARC" + (fixes #3251) + +This reverts commit f14f9142f4487704e2ce0f196263c091accdb12c. + +x-ref: + "[1.4.76] buildroot compile error with bootlin-sparc{64-g,-uc}libc" + https://redmine.lighttpd.net/issues/3251 +--- + src/fdevent.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/fdevent.h b/src/fdevent.h +index e9c380b0f..1b0a062fc 100644 +--- a/src/fdevent.h ++++ b/src/fdevent.h +@@ -40,8 +40,6 @@ struct fdnode_st { + #if (defined(__sun) && defined(__SVR4)) /* Solaris */ \ + || defined(__FreeBSD__) + #define FDEVENT_RDHUP 0x4000 +-#elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) +-#define FDEVENT_RDHUP 0x0800 + #else + #define FDEVENT_RDHUP 0x2000 + #endif + +From 524614455554163ec78b27b89ff52bbf7fe96958 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Wed, 24 Apr 2024 03:07:37 -0400 +Subject: [PATCH] [core] special value for Linux POLLRDHUP on SPARC (fixes + #3251) + +x-ref: + "[1.4.76] buildroot compile error with bootlin-sparc{64-g,-uc}libc" + https://redmine.lighttpd.net/issues/3251 +--- + src/fdevent.h | 2 ++ + src/fdevent_impl.c | 18 ++++++++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/src/fdevent.h b/src/fdevent.h +index 1b0a062fc..556a14455 100644 +--- a/src/fdevent.h ++++ b/src/fdevent.h +@@ -40,6 +40,8 @@ struct fdnode_st { + #if (defined(__sun) && defined(__SVR4)) /* Solaris */ \ + || defined(__FreeBSD__) + #define FDEVENT_RDHUP 0x4000 ++#elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++#define FDEVENT_RDHUP 0x2800 /*(0x2000 EPOLLRDHUP | 0x0800 POLLRDHUP)*/ + #else + #define FDEVENT_RDHUP 0x2000 + #endif +diff --git a/src/fdevent_impl.c b/src/fdevent_impl.c +index 8bfc1cc68..c84c8df57 100644 +--- a/src/fdevent_impl.c ++++ b/src/fdevent_impl.c +@@ -338,6 +338,11 @@ fdevent_linux_sysepoll_event_set (fdevents *ev, fdnode *fdn, int events) + struct epoll_event ep; + #ifndef EPOLLRDHUP + events &= ~FDEVENT_RDHUP; ++ #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ if (events & FDEVENT_RDHUP) { ++ events &= ~FDEVENT_RDHUP; ++ events |= EPOLLRDHUP; ++ } + #endif + ep.events = events | EPOLLERR | EPOLLHUP; + ep.data.ptr = fdn; +@@ -376,7 +381,11 @@ fdevent_linux_sysepoll_init (fdevents *ev) + ck_static_assert(EPOLLERR == FDEVENT_ERR); + ck_static_assert(EPOLLHUP == FDEVENT_HUP); + #ifdef EPOLLRDHUP ++ #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ ck_static_assert(EPOLLRDHUP & FDEVENT_RDHUP); ++ #else + ck_static_assert(EPOLLRDHUP == FDEVENT_RDHUP); ++ #endif + #endif + + ev->type = FDEVENT_HANDLER_LINUX_SYSEPOLL; +@@ -770,6 +779,11 @@ fdevent_poll_event_set (fdevents *ev, fdnode *fdn, int events) + + #ifndef POLLRDHUP + events &= ~FDEVENT_RDHUP; ++ #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ if (events & FDEVENT_RDHUP) { ++ events &= ~FDEVENT_RDHUP; ++ events |= POLLRDHUP; ++ } + #endif + + if (k >= 0) { +@@ -854,7 +868,11 @@ fdevent_poll_init (fdevents *ev) + ck_static_assert(POLLHUP == FDEVENT_HUP); + ck_static_assert(POLLNVAL == FDEVENT_NVAL); + #ifdef POLLRDHUP ++ #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ ck_static_assert(POLLRDHUP & FDEVENT_RDHUP); ++ #else + ck_static_assert(POLLRDHUP == FDEVENT_RDHUP); ++ #endif + #endif + + ev->type = FDEVENT_HANDLER_POLL; diff --git a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild index 95a95e50e4a8..c61fbf73771c 100644 --- a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild @@ -75,6 +75,10 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-lighttpd ) " +PATCHES=( + "${FILESDIR}"/${P}-sparc.patch +) + # update certain parts of lighttpd.conf based on conditionals update_config() { local config="${ED}/etc/lighttpd/lighttpd.conf" diff --git a/www-servers/lighttpd/lighttpd-1.4.76.ebuild b/www-servers/lighttpd/lighttpd-1.4.76.ebuild index 48fd28333e6b..f34148cf6d04 100644 --- a/www-servers/lighttpd/lighttpd-1.4.76.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.76.ebuild @@ -69,6 +69,10 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-lighttpd ) " +PATCHES=( + "${FILESDIR}"/${P}-sparc.patch +) + # update certain parts of lighttpd.conf based on conditionals update_config() { local config="${ED}/etc/lighttpd/lighttpd.conf"