* [gentoo-commits] repo/gentoo:master commit in: net-misc/nx/files/, net-misc/nx/
@ 2023-03-19 0:16 99% Bernard Cafarelli
0 siblings, 0 replies; 1+ results
From: Bernard Cafarelli @ 2023-03-19 0:16 UTC (permalink / raw
To: gentoo-commits
commit: 9ccc914e8d3ddd9daedc72e84d685c316d33093f
Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Thu Mar 16 20:07:02 2023 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 00:08:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ccc914e
net-misc/nx: fix musl build
This patch comes from the following upstream commits.
* mesa - Remove use of fpu_control.h (https://gitlab.freedesktop.org/mesa/mesa/-/commit/eb0ff1a1c0f1978d867c748bf2525f717a56bfce)
* xorg/xserver - Drop workaround for pre-glibc linux (https://gitlab.freedesktop.org/xorg/xserver/-/commit/6634ffc4d26846dcf892f27682f9021f6d9956a9)
Closes: https://github.com/gentoo/gentoo/pull/30165
Closes: https://bugs.gentoo.org/713418
Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
net-misc/nx/files/nx-3.5.99.25-musl.patch | 54 ++++++++++++++++++++++++++++++
net-misc/nx/files/nx-3.5.99.26-musl.patch | 55 +++++++++++++++++++++++++++++++
net-misc/nx/nx-3.5.99.25.ebuild | 6 +++-
net-misc/nx/nx-3.5.99.26.ebuild | 3 +-
4 files changed, 116 insertions(+), 2 deletions(-)
diff --git a/net-misc/nx/files/nx-3.5.99.25-musl.patch b/net-misc/nx/files/nx-3.5.99.25-musl.patch
new file mode 100644
index 000000000000..d7f76c04802c
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.25-musl.patch
@@ -0,0 +1,54 @@
+diff -uNr a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h
+--- a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h 2020-11-04 06:43:58.000000000 -0600
++++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h 2023-03-16 12:58:34.515215736 -0600
+@@ -62,9 +62,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#if defined(__linux__) && defined(__i386__)
+-#include <fpu_control.h>
+-#endif
+ #endif
+ #include <float.h>
+ #include <stdarg.h>
+diff -uNr a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c
+--- a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c 2020-11-04 06:43:58.000000000 -0600
++++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c 2023-03-16 12:59:23.828001633 -0600
+@@ -1169,20 +1169,6 @@
+ static GLboolean initialized = GL_FALSE;
+ if (!initialized) {
+ init_sqrt_table();
+-
+-#if defined(_FPU_GETCW) && defined(_FPU_SETCW)
+- {
+- const char *debug = _mesa_getenv("MESA_DEBUG");
+- if (debug && _mesa_strcmp(debug, "FP")==0) {
+- /* die on FP exceptions */
+- fpu_control_t mask;
+- _FPU_GETCW(mask);
+- mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM
+- | _FPU_MASK_OM | _FPU_MASK_UM);
+- _FPU_SETCW(mask);
+- }
+- }
+-#endif
+ initialized = GL_TRUE;
+ }
+
+diff -uNr a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c
+--- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2020-11-04 06:43:58.000000000 -0600
++++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2023-03-16 13:01:30.256598143 -0600
+@@ -40,13 +40,6 @@
+
+ #include <sys/types.h>
+ #ifdef HAS_SHM
+-#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
+-/* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
+-/* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
+- Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
+- PAGE_SIZE. It is defined in <asm/page.h>. */
+-#include <asm/page.h>
+-#endif
+ #ifdef SVR4
+ #include <sys/sysmacros.h>
+ #endif
diff --git a/net-misc/nx/files/nx-3.5.99.26-musl.patch b/net-misc/nx/files/nx-3.5.99.26-musl.patch
new file mode 100644
index 000000000000..738b7a2469aa
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-musl.patch
@@ -0,0 +1,55 @@
+diff -uNr a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h
+--- a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h 2021-02-04 07:34:56.000000000 -0600
++++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h 2023-03-16 13:55:33.983114692 -0600
+@@ -62,9 +62,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#if defined(__linux__) && defined(__i386__)
+-#include <fpu_control.h>
+-#endif
+ #endif
+ #include <float.h>
+ #include <stdarg.h>
+diff -uNr a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c
+--- a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c 2021-02-04 07:34:56.000000000 -0600
++++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c 2023-03-16 13:56:25.569122176 -0600
+@@ -1169,20 +1169,6 @@
+ static GLboolean initialized = GL_FALSE;
+ if (!initialized) {
+ init_sqrt_table();
+-
+-#if defined(_FPU_GETCW) && defined(_FPU_SETCW)
+- {
+- const char *debug = _mesa_getenv("MESA_DEBUG");
+- if (debug && _mesa_strcmp(debug, "FP")==0) {
+- /* die on FP exceptions */
+- fpu_control_t mask;
+- _FPU_GETCW(mask);
+- mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM
+- | _FPU_MASK_OM | _FPU_MASK_UM);
+- _FPU_SETCW(mask);
+- }
+- }
+-#endif
+ initialized = GL_TRUE;
+ }
+
+diff -uNr a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c
+--- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2021-02-04 07:34:56.000000000 -0600
++++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2023-03-16 13:57:30.694956647 -0600
+@@ -40,14 +40,7 @@
+
+ #include <sys/types.h>
+ #ifdef HAS_SHM
+-#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
+-/* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
+-/* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
+- Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
+- PAGE_SIZE. It is defined in <asm/page.h>. */
+-#include <asm/page.h>
+ #include <limits.h>
+-#endif
+ #ifdef SVR4
+ #include <sys/sysmacros.h>
+ #endif
diff --git a/net-misc/nx/nx-3.5.99.25.ebuild b/net-misc/nx/nx-3.5.99.25.ebuild
index 10bdd7240081..90e978be610a 100644
--- a/net-misc/nx/nx-3.5.99.25.ebuild
+++ b/net-misc/nx/nx-3.5.99.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -42,6 +42,10 @@ BDEPEND="sys-apps/which
S="${WORKDIR}/nx-libs-${PV}"
+PATCHES=(
+ "${FILESDIR}/${PN}-3.5.99.25-musl.patch"
+)
+
src_prepare() {
default
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 2e50edab9c33..55392ed99c6b 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -47,6 +47,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.5.99.26-binutils-2.36.patch"
# https://github.com/ArcticaProject/nx-libs/pull/1023
"${FILESDIR}/${PN}-3.5.99.26-riscv64-support.patch"
+ "${FILESDIR}/${PN}-3.5.99.26-musl.patch"
)
src_prepare() {
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-03-19 0:16 99% [gentoo-commits] repo/gentoo:master commit in: net-misc/nx/files/, net-misc/nx/ Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox