From e198a5a925ecd84173ac26a1cc3e25b85caf234f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 15 May 2015 07:33:40 +0200 Subject: [PATCH] libGL: disable glx-tls on musl. See https://bugs.freedesktop.org/show_bug.cgi?id=35268 --- srcpkgs/libGL/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index 10606feeb7..5e04b62bd4 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,10 +1,10 @@ # Template build file for 'libGL'. pkgname=libGL version=10.5.5 -revision=1 +revision=2 wrksrc="mesa-${version}" build_style=gnu-configure -configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm +configure_args="--enable-shared-glapi --enable-gbm --enable-gles1 --enable-gles2 --enable-egl --enable-vdpau --enable-xvmc --enable-osmesa --enable-texture-float --with-egl-platforms=x11,drm,wayland" @@ -60,6 +60,11 @@ case "$XBPS_TARGET_MACHINE" in i686*) configure_args+=" --with-dri-driverdir=/usr/lib32/xorg/modules/drivers";; *) configure_args+=" --with-dri-driverdir=/usr/lib/xorg/modules/drivers";; esac +case "$XBPS_TARGET_MACHINE" in + # Disable TLS with musl: https://bugs.freedesktop.org/show_bug.cgi?id=35268 + *-musl) configure_args+=" --disable-glx-tls";; + *) configure_args+=" --enable-glx-tls";; +esac pre_configure() {