diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-07-21 13:30:51 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-07-21 13:30:51 +0000 |
| commit | f67cb00c9d8074ebe29214464ffe370f671635c7 (patch) | |
| tree | 6bf5375a056ce53d064bd9113bb7f44dd9e0da57 /lib/mesa | |
| parent | fec777666fdad5b79717df28e240f90b13d3b131 (diff) | |
don't build libgallium_drv_video when WITH_VAAPI==no
ok matthieu@ rsadowski@
Diffstat (limited to 'lib/mesa')
| -rw-r--r-- | lib/mesa/mk/Makefile | 4 | ||||
| -rw-r--r-- | lib/mesa/mk/libgallium_drv_video/Makefile | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/mesa/mk/Makefile b/lib/mesa/mk/Makefile index f48655806..a1bf7606d 100644 --- a/lib/mesa/mk/Makefile +++ b/lib/mesa/mk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2024/07/19 14:42:33 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.10 2024/07/21 13:30:50 jsg Exp $ .include "config.mk" @@ -102,6 +102,8 @@ SUBDIR+= libglapi libgbm libEGL libGL libGLESv1_CM libGLESv2 libOSMesa SUBDIR+= libgallium_dri +.if ${WITH_VAAPI} == "yes" || make(obj) SUBDIR+= libgallium_drv_video +.endif .include <bsd.subdir.mk> diff --git a/lib/mesa/mk/libgallium_drv_video/Makefile b/lib/mesa/mk/libgallium_drv_video/Makefile index 998158836..3c35f28e5 100644 --- a/lib/mesa/mk/libgallium_drv_video/Makefile +++ b/lib/mesa/mk/libgallium_drv_video/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2024/07/19 14:40:46 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.2 2024/07/21 13:30:50 jsg Exp $ LIB= gallium_drv_video @@ -81,10 +81,7 @@ SLIBS+= libradeonwinsys .endif LDADD+= -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,--whole-archive -Wl,--start-group - -.if ${WITH_VAAPI} == "yes" LDADD+= ${.CURDIR}/../libva_st/${__objdir}/libva_st.a -Wl,--no-whole-archive -Wl,-z,origin -.endif .if ${WITH_GALLIUM_R600} == "yes" SLIBS+= libr600 |