openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 18:28:43 +00:00
Code Issues Projects Releases Wiki Activity

link against libpthread where libmesa_util_c11 is used

Browse Source 
OpenBSD doesn't have c11 threads.h functions.  Instead Mesa's
replacements are used.

fixes build of graphics/piglit reported by naddy@
This commit is contained in:
jsg
2023-01-31 03:29:36 +00:00
parent 286474af33
commit d559c33fb8
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mesa/mk/libEGL/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2023/01/29 12:20:31 jsg Exp $
# $OpenBSD: Makefile,v 1.9 2023/01/31 03:29:36 jsg Exp $
.include <bsd.xconf.mk>
@@ -49,7 +49,7 @@ LDADD+= ${.CURDIR}/../libmesa_util_sse41/${__objdir}/libmesa_util_sse41.a
LDADD+= ${.CURDIR}/../libmesa_util_c11/${__objdir}/libmesa_util_c11.a \
-Wl,--gc-sections \
-lz -lm \
-lz -lm -lpthread \
-L${X11BASE}/lib -lX11-xcb -lX11 -lxcb -lxcb-randr -lxcb-xfixes
.if ${XENOCARA_BUILD_DRI:L} == "yes"

4
lib/mesa/mk/libGLESv1_CM/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2023/01/28 08:56:33 jsg Exp $
# $OpenBSD: Makefile,v 1.4 2023/01/31 03:29:36 jsg Exp $
LIB= GLESv1_CM
@@ -12,7 +12,7 @@ CPPFLAGS+= -DMAPI_MODE_BRIDGE \
LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi \
${.CURDIR}/../libmesa_util_c11/${__objdir}/libmesa_util_c11.a \
-L${X11BASE}/lib -ldrm -lm
-L${X11BASE}/lib -ldrm -lm -lpthread
obj: _xenocara_obj

4
lib/mesa/mk/libGLESv2/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2023/01/28 08:56:33 jsg Exp $
# $OpenBSD: Makefile,v 1.4 2023/01/31 03:29:36 jsg Exp $
LIB= GLESv2
@@ -12,7 +12,7 @@ CPPFLAGS+= -DMAPI_MODE_BRIDGE \
LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi \
${.CURDIR}/../libmesa_util_c11/${__objdir}/libmesa_util_c11.a \
-L${X11BASE}/lib -ldrm -lm
-L${X11BASE}/lib -ldrm -lm -lpthread
obj: _xenocara_obj

4
lib/mesa/mk/libOSMesa/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2023/01/29 12:20:31 jsg Exp $
# $OpenBSD: Makefile,v 1.7 2023/01/31 03:29:36 jsg Exp $
LIB= OSMesa
@@ -58,7 +58,7 @@ LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi
LDADD+= -Wl,--gc-sections
LDADD+= -Wl,--version-script ${MESA_SRC}/src/gallium/targets/osmesa/osmesa.sym
LDADD+= -lLLVM -lm -lz
LDADD+= -lLLVM -lm -lz -lpthread
LDADD+= -L${X11BASE}/lib -ldrm
LDADD+= -Wl,--end-group

4
lib/mesa/mk/libgallium_dri/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2023/01/29 12:20:31 jsg Exp $
# $OpenBSD: Makefile,v 1.7 2023/01/31 03:29:36 jsg Exp $
LIB= gallium_dri
@@ -181,7 +181,7 @@ LDADD+= ${.CURDIR}/../${slib}/${__objdir}/${slib}.a
.endfor
LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi
LDADD+= -lelf -lLLVM -lexpat -lz -lm
LDADD+= -lelf -lLLVM -lexpat -lz -lm -lpthread
LDADD+= -L${X11BASE}/lib -ldrm
.if ${WITH_GALLIUM_I915} == "yes"

6
lib/mesa/mk/libgbm/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2023/01/29 12:20:31 jsg Exp $
# $OpenBSD: Makefile,v 1.8 2023/01/31 03:29:36 jsg Exp $
.include <bsd.xconf.mk>
@@ -23,7 +23,7 @@ LDADD+= -Wl,--as-needed -Wl,--start-group \
${.CURDIR}/../libloader/${__objdir}/libloader.a \
${.CURDIR}/../libmesa_util/${__objdir}/libmesa_util.a \
${.CURDIR}/../libmesa_format/${__objdir}/libmesa_format.a \
${.CURDIR}/../libmesa_util_c11/${__objdir}/libmesa_util_c11.a \
${.CURDIR}/../libmesa_util_c11/${__objdir}/libmesa_util_c11.a
.if ${WITH_SSE41} == "yes"
LDADD+=${.CURDIR}/../libmesa_util_sse41/${__objdir}/libmesa_util_sse41.a
@@ -31,7 +31,7 @@ LDADD+=${.CURDIR}/../libmesa_util_sse41/${__objdir}/libmesa_util_sse41.a
LDADD+= ${.CURDIR}/../libxmlconfig/${__objdir}/libxmlconfig.a \
-Wl,--gc-sections \
-lz -lm -lexpat
-lz -lm -lexpat -lpthread
.if ${XENOCARA_BUILD_DRI:L} == "yes"
LDADD+= -L${X11BASE}/lib -ldrm

4
lib/mesa/mk/libglapi/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2023/01/28 08:56:34 jsg Exp $
# $OpenBSD: Makefile,v 1.4 2023/01/31 03:29:36 jsg Exp $
LIB= glapi
@@ -19,7 +19,7 @@ CPPFLAGS+= -DMAPI_MODE_GLAPI \
LDADD+= -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,--start-group \
${.CURDIR}/../libmesa_util/${__objdir}/libmesa_util.a \
${.CURDIR}/../libmesa_util_c11/${__objdir}/libmesa_util_c11.a \
-Wl,--gc-sections -pthread -lm -Wl,--end-group
-Wl,--gc-sections -lpthread -lm -Wl,--end-group
obj: _xenocara_obj

4
lib/mesa/mk/libvulkan_intel/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2023/01/28 08:56:35 jsg Exp $
# $OpenBSD: Makefile,v 1.6 2023/01/31 03:29:36 jsg Exp $
LIB= vulkan_intel
@@ -92,7 +92,7 @@ LDADD+= -Wl,--no-whole-archive
LDADD+= ${.CURDIR}/../${slib}/${__objdir}/${slib}.a
.endfor
LDADD+= -pthread -lm -lz -lexpat
LDADD+= -lpthread -lm -lz -lexpat
LDADD+= -L${X11BASE}/lib -ldrm \
-lxcb-dri3 -lxcb-randr -lXrandr -lxcb -lX11-xcb \
-lX11 -lxcb-dri2 -lxcb-present -lxcb-xfixes -lxcb-sync \

4
lib/mesa/mk/libvulkan_intel_hasvk/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2023/01/28 08:56:35 jsg Exp $
# $OpenBSD: Makefile,v 1.2 2023/01/31 03:29:36 jsg Exp $
LIB= vulkan_intel_hasvk
@@ -92,7 +92,7 @@ LDADD+= -Wl,--no-whole-archive
LDADD+= ${.CURDIR}/../${slib}/${__objdir}/${slib}.a
.endfor
LDADD+= -pthread -lm -lz -lexpat
LDADD+= -lpthread -lm -lz -lexpat
LDADD+= -L${X11BASE}/lib -ldrm \
-lxcb-dri3 -lxcb-randr -lXrandr -lxcb -lX11-xcb \
-lX11 -lxcb-dri2 -lxcb-present -lxcb-xfixes -lxcb-sync \