diff options
author | iddinev <xidinev@gmail.com> | 2019-03-19 17:59:52 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-03-21 07:53:33 -0700 |
commit | 7ed921f8853a0ed8fb60789a107a937137198483 (patch) | |
tree | b0c601da3696c1705df1772e9ea6c31a3815ad9f /meta-oe/recipes-support/libutempter/libutempter | |
parent | 74bab845c6905ce9cd1c74f237971a6b7aa9e4c8 (diff) | |
download | meta-openembedded-7ed921f8853a0ed8fb60789a107a937137198483.tar.gz |
recipes-support/libutempter: Fix the macro string concatenation.
The previous patch 0001-Fix-macro-error.patch erroneously assumes
that the 'MACRO1##MACRO2' operation expands the macros
before concatination. As a result the UTEMPTER_DEFAULT_PATHNAME
always gets the literal RAW_UTEMPTER_PATH value.
Signed-off-by: iddinev <xidinev@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/libutempter/libutempter')
-rw-r--r-- | meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch new file mode 100644 index 000000000..2a866c079 --- /dev/null +++ b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 48b6bcf9f5d8a05eace4bc463c47e8a4715d3000 Mon Sep 17 00:00:00 2001 | ||
2 | From: iddinev <xidinev@gmail.com> | ||
3 | Date: Mon, 18 Mar 2019 15:45:20 +0200 | ||
4 | Subject: [PATCH] Proper macro path generation. | ||
5 | |||
6 | Signed-off-by: iddinev <xidinev@gmail.com> | ||
7 | --- | ||
8 | libutempter/iface.c | 7 +++---- | ||
9 | 1 file changed, 3 insertions(+), 4 deletions(-) | ||
10 | |||
11 | diff --git libutempter/iface.c libutempter/iface.c | ||
12 | index 27793f0..c1c0ee9 100644 | ||
13 | --- libutempter/iface.c | ||
14 | +++ libutempter/iface.c | ||
15 | @@ -44,13 +44,12 @@ | ||
16 | #endif | ||
17 | |||
18 | #ifdef LIBEXECDIR | ||
19 | -# define CAT_PATH(DIR1,DIR2) DIR1##DIR2 | ||
20 | -# define RAW_UTEMPTER_PATH CAT_PATH(LIBEXECDIR,/utempter/utempter) | ||
21 | +# define UTEMPTER_DEFAULT_PATHNAME XSTR_PATH(LIBEXECDIR)"/utempter/utempter" | ||
22 | #else | ||
23 | -# define RAW_UTEMPTER_PATH /usr/lib/libtempter/utempter/utempter | ||
24 | +# define UTEMPTER_DEFAULT_PATHNAME STR_PATH(/usr/lib/libtempter/utempter/utempter) | ||
25 | #endif | ||
26 | #define STR_PATH(RAW_STR) #RAW_STR | ||
27 | -#define UTEMPTER_DEFAULT_PATHNAME STR_PATH(RAW_UTEMPTER_PATH) | ||
28 | +#define XSTR_PATH(STR) STR_PATH(STR) | ||
29 | |||
30 | static const char *utempter_pathname; | ||
31 | static int saved_fd = -1; | ||
32 | -- | ||
33 | 2.7.4 | ||
34 | |||