diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 10:05:37 -0700 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-22 21:26:31 -0400 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.gz talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.zip |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch')
-rw-r--r-- | poky/meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/poky/meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch b/poky/meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch new file mode 100644 index 000000000..9a44b5484 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch @@ -0,0 +1,45 @@ +From ea4caaa1c6a6dc682bb04548ab05c5c73d0b45d6 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Mon, 26 Feb 2018 15:34:52 +0800 +Subject: [PATCH 10/31] check for uchar.h in meson.build + +Use #if HAVE_UCHAR_H to include uchar.h conditionally. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + meson.build | 1 + + src/basic/missing.h | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/meson.build b/meson.build +index 9c25022a4..94a16712b 100644 +--- a/meson.build ++++ b/meson.build +@@ -623,6 +623,7 @@ foreach header : ['crypt.h', + 'sys/auxv.h', + 'valgrind/memcheck.h', + 'valgrind/valgrind.h', ++ 'uchar.h', + ] + + conf.set10('HAVE_' + header.underscorify().to_upper(), +diff --git a/src/basic/missing.h b/src/basic/missing.h +index 39c1fb700..84d6d9167 100644 +--- a/src/basic/missing.h ++++ b/src/basic/missing.h +@@ -38,7 +38,9 @@ + #include <sys/resource.h> + #include <sys/socket.h> + #include <sys/syscall.h> ++#if HAVE_UCHAR_H + #include <uchar.h> ++#endif + #include <unistd.h> + + #if HAVE_AUDIT +-- +2.13.0 + |