diff options
Diffstat (limited to 'meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch')
-rw-r--r-- | meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch index ad1063b2c3..bc753de113 100644 --- a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch +++ b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6a6223a8e217664a348835e92d5a602f50e18b2c Mon Sep 17 00:00:00 2001 | 1 | From b4c64b6f07743e3fb63ce52359bc664ab7d60df0 Mon Sep 17 00:00:00 2001 |
2 | From: Joshua Watt <JPEWhacker@gmail.com> | 2 | From: Joshua Watt <JPEWhacker@gmail.com> |
3 | Date: Thu, 20 Feb 2020 15:20:45 -0600 | 3 | Date: Thu, 20 Feb 2020 15:20:45 -0600 |
4 | Subject: [PATCH] build: Fix strndup detection on MinGW | 4 | Subject: [PATCH] build: Fix strndup detection on MinGW |
@@ -11,27 +11,31 @@ for strndup(). | |||
11 | 11 | ||
12 | See: https://github.com/mesonbuild/meson/issues/3672 | 12 | See: https://github.com/mesonbuild/meson/issues/3672 |
13 | 13 | ||
14 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> | ||
15 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63] | 14 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63] |
16 | 15 | ||
16 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> | ||
17 | Signed-off-by: Denys Dmytriyenko <denis@denix.org> | ||
17 | --- | 18 | --- |
18 | meson.build | 2 +- | 19 | meson.build | 2 +- |
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 21 | ||
21 | diff --git a/meson.build b/meson.build | 22 | diff --git a/meson.build b/meson.build |
22 | index 11c35fa..80729d0 100644 | 23 | index 3bc25c9..adde7b9 100644 |
23 | --- a/meson.build | 24 | --- a/meson.build |
24 | +++ b/meson.build | 25 | +++ b/meson.build |
25 | @@ -36,11 +36,11 @@ have_funcs = [ | 26 | @@ -38,11 +38,11 @@ have_funcs = [ |
26 | 'posix_fallocate', | ||
27 | 'prctl', | 27 | 'prctl', |
28 | 'memfd_create', | 28 | 'memfd_create', |
29 | 'mremap', | ||
29 | - 'strndup', | 30 | - 'strndup', |
30 | ] | 31 | ] |
31 | foreach f: have_funcs | 32 | foreach f: have_funcs |
32 | config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f)) | 33 | config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f)) |
33 | endforeach | 34 | endforeach |
34 | +config_h.set('HAVE_STRNDUP', cc.has_function('strndup') and cc.has_header_symbol('string.h', 'strndup')) | 35 | +config_h.set('HAVE_STRNDUP', cc.has_function('strndup') and cc.has_header_symbol('string.h', 'strndup')) |
35 | 36 | config_h.set10('HAVE_XUCRED_CR_PID', cc.has_member('struct xucred', 'cr_pid', prefix : '#include <sys/ucred.h>')) | |
36 | if get_option('libraries') | 37 | have_broken_msg_cmsg_cloexec = false |
37 | ffi_dep = dependency('libffi') | 38 | if host_machine.system() == 'freebsd' |
39 | -- | ||
40 | 2.7.4 | ||
41 | |||