Revert "libGL: request stack size on newer musl systems"

This reverts commit 3dc48b45dd. libGL and
mesa drivers are commonly loaded dynamicly. This commit re-introduces
the patch to make sure stack-size is loaded properly even if the library
is loaded dynamicly.
This commit is contained in:
Enno Boland 2019-02-02 08:46:52 +01:00
parent b9ed41788d
commit f970f7dbd8
No known key found for this signature in database
GPG key ID: D09964719BDE9971
2 changed files with 36 additions and 2 deletions

View file

@ -0,0 +1,35 @@
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;
}

View file

@ -1,7 +1,7 @@
# Template file for 'libGL'
pkgname=libGL
version=18.3.2
revision=2
revision=3
wrksrc="mesa-${version}"
build_style=meson
configure_args="-Dshared-glapi=true -Dgbm=true -Degl=true
@ -22,7 +22,6 @@ 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"