[PATCH libdrm v2 01/23] meson: don't enable libdrm_intel without atomic support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



In the 'auto' case, the `with_atomic` check was bypassed.

Signed-off-by: Eric Engestrom <eric.engestrom@xxxxxxxxxx>
---
 meson.build | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index 961ee59cff6dc3c2cbb9..e762dcc44bff5deac4d1 100644
--- a/meson.build
+++ b/meson.build
@@ -71,12 +71,13 @@ config.set10('HAVE_LIB_ATOMIC_OPS', lib_atomics)
 
 with_intel = false
 _intel = get_option('intel')
-if _intel != 'false'
-  if _intel == 'true' and not with_atomics
-    error('libdrm_intel requires atomics.')
-  else
-    with_intel = _intel == 'true' or host_machine.cpu_family().startswith('x86')
-  endif
+if _intel == 'auto'
+  with_intel = with_atomics and host_machine.cpu_family().startswith('x86')
+else
+  with_intel = _intel == 'true'
+endif
+if with_intel and not with_atomics
+  error('libdrm_intel requires atomics.')
 endif
 
 with_radeon = false
-- 
Cheers,
  Eric

_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel




[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux