summaryrefslogtreecommitdiff
path: root/lib/mesa/mk
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2023-01-31 03:29:37 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2023-01-31 03:29:37 +0000
commita6e267f044281393d70ac717e77cf85edc051466 (patch)
treea007772a2cdf42c4416ac568f8f73c9b37fe461f /lib/mesa/mk
parent5a05b6545ded59b7f9ea3bba6ff44aa4f4d5a40b (diff)
link against libpthread where libmesa_util_c11 is used
OpenBSD doesn't have c11 threads.h functions. Instead Mesa's replacements are used. fixes build of graphics/piglit reported by naddy@
Diffstat (limited to 'lib/mesa/mk')
-rw-r--r--lib/mesa/mk/libEGL/Makefile4
-rw-r--r--lib/mesa/mk/libGLESv1_CM/Makefile4
-rw-r--r--lib/mesa/mk/libGLESv2/Makefile4
-rw-r--r--lib/mesa/mk/libOSMesa/Makefile4
-rw-r--r--lib/mesa/mk/libgallium_dri/Makefile4
-rw-r--r--lib/mesa/mk/libgbm/Makefile6
-rw-r--r--lib/mesa/mk/libglapi/Makefile4
-rw-r--r--lib/mesa/mk/libvulkan_intel/Makefile4
-rw-r--r--lib/mesa/mk/libvulkan_intel_hasvk/Makefile4
9 files changed, 19 insertions, 19 deletions
diff --git a/lib/mesa/mk/libEGL/Makefile b/lib/mesa/mk/libEGL/Makefile
index bf3b72e00..609f44dd7 100644
--- a/lib/mesa/mk/libEGL/Makefile
+++ b/lib/mesa/mk/libEGL/Makefile
@@ -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"
diff --git a/lib/mesa/mk/libGLESv1_CM/Makefile b/lib/mesa/mk/libGLESv1_CM/Makefile
index 2414a3f0f..ae41f39be 100644
--- a/lib/mesa/mk/libGLESv1_CM/Makefile
+++ b/lib/mesa/mk/libGLESv1_CM/Makefile
@@ -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
diff --git a/lib/mesa/mk/libGLESv2/Makefile b/lib/mesa/mk/libGLESv2/Makefile
index 90a89e051..dddc79e1d 100644
--- a/lib/mesa/mk/libGLESv2/Makefile
+++ b/lib/mesa/mk/libGLESv2/Makefile
@@ -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
diff --git a/lib/mesa/mk/libOSMesa/Makefile b/lib/mesa/mk/libOSMesa/Makefile
index 1965946f1..7a132716e 100644
--- a/lib/mesa/mk/libOSMesa/Makefile
+++ b/lib/mesa/mk/libOSMesa/Makefile
@@ -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
diff --git a/lib/mesa/mk/libgallium_dri/Makefile b/lib/mesa/mk/libgallium_dri/Makefile
index b9e2755d9..9dd376cbb 100644
--- a/lib/mesa/mk/libgallium_dri/Makefile
+++ b/lib/mesa/mk/libgallium_dri/Makefile
@@ -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"
diff --git a/lib/mesa/mk/libgbm/Makefile b/lib/mesa/mk/libgbm/Makefile
index c35a6222c..b8e9a3d73 100644
--- a/lib/mesa/mk/libgbm/Makefile
+++ b/lib/mesa/mk/libgbm/Makefile
@@ -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
diff --git a/lib/mesa/mk/libglapi/Makefile b/lib/mesa/mk/libglapi/Makefile
index faf3e351b..c07bffe83 100644
--- a/lib/mesa/mk/libglapi/Makefile
+++ b/lib/mesa/mk/libglapi/Makefile
@@ -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
diff --git a/lib/mesa/mk/libvulkan_intel/Makefile b/lib/mesa/mk/libvulkan_intel/Makefile
index 205c6bb5e..4b23c9f73 100644
--- a/lib/mesa/mk/libvulkan_intel/Makefile
+++ b/lib/mesa/mk/libvulkan_intel/Makefile
@@ -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 \
diff --git a/lib/mesa/mk/libvulkan_intel_hasvk/Makefile b/lib/mesa/mk/libvulkan_intel_hasvk/Makefile
index 73fd77521..6d6c35fa0 100644
--- a/lib/mesa/mk/libvulkan_intel_hasvk/Makefile
+++ b/lib/mesa/mk/libvulkan_intel_hasvk/Makefile
@@ -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 \