diff --git a/srcpkgs/libGL/patches/musl-stacksize.patch b/srcpkgs/libGL/patches/musl-stacksize.patch deleted file mode 100644 index a8fb6735517..00000000000 --- a/srcpkgs/libGL/patches/musl-stacksize.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h -index 45cb6075e6..1a2ea1a450 100644 ---- ./include/c11/threads_posix.h -+++ ./include/c11/threads_posix.h -@@ -281,15 +281,29 @@ static inline int - thrd_create(thrd_t *thr, thrd_start_t func, void *arg) - { - struct impl_thrd_param *pack; -+#ifdef __GLIBC__ -+ pthread_attr_t *attrp = NULL; -+#else -+ pthread_attr_t attr = { 0 }; -+ pthread_attr_init(&attr); -+ pthread_attr_setstacksize(&attr, 8388608); -+ pthread_attr_t *attrp = &attr; -+#endif - assert(thr != NULL); - pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param)); - if (!pack) return thrd_nomem; - pack->func = func; - pack->arg = arg; -- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) { -+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) { -+#ifndef __GLIBC__ -+ pthread_attr_destroy(&attr); -+#endif - free(pack); - return thrd_error; - } -+#ifndef __GLIBC__ -+ pthread_attr_destroy(&attr); -+#endif - return thrd_success; - } - diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index 21324c357c0..b29fa672c82 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,7 +1,7 @@ # Template file for 'libGL' pkgname=libGL version=18.3.2 -revision=1 +revision=2 wrksrc="mesa-${version}" build_style=meson configure_args="-Dshared-glapi=true -Dgbm=true -Degl=true @@ -22,6 +22,7 @@ homepage="https://www.mesa3d.org/" changelog="https://www.mesa3d.org/relnotes/${version}.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" checksum=f7ce7181c07b6d8e0132da879af1729523a6c8aa87f79a9d59dfd064024cfb35 +LDFLAGS+=" -Wl,-z,stack-size=2097152" # Set subpackages manually to set proper rdeps in 32bit pkgs. subpackages="libglapi libgbm libEGL libGLES libOSMesa"