xserver: Branch 'master'

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Apr 14 15:02:03 UTC 2023


 include/meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 636c9aa359eab45102c12a9fccb8f60587c7d485
Author: Simon Ser <contact at emersion.fr>
Date:   Sat Feb 18 11:29:25 2023 +0100

    build: set _GNU_SOURCE when checking for SO_PEERCRED
    
    SO_PEERCRED is not POSIX, so might be hidden unless _GNU_SOURCE
    is defined.
    
    See [1]: cc.has_header_symbol() does not inherit the project
    arguments.
    
    [1]: https://github.com/mesonbuild/meson/issues/3301
    
    Signed-off-by: Simon Ser <contact at emersion.fr>

diff --git a/include/meson.build b/include/meson.build
index a65bd35b5..fb8568489 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -192,7 +192,7 @@ if cc.has_header_symbol('sys/socket.h', 'SCM_RIGHTS')
 endif
 
 if conf_data.get('HAVE_GETPEEREID').to_int() == 0 and conf_data.get('HAVE_GETPEERUCRED').to_int() == 0
-    if not cc.has_header_symbol('sys/socket.h', 'SO_PEERCRED')
+    if not cc.has_header_symbol('sys/socket.h', 'SO_PEERCRED', args: '-D_GNU_SOURCE')
         conf_data.set('NO_LOCAL_CLIENT_CRED', 1)
     endif
 endif


More information about the xorg-commit mailing list