diff options
author | Qian Lei <qianl.fnst@cn.fujitsu.com> | 2015-01-09 11:01:08 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-01-12 15:34:01 +0100 |
commit | da4dab68d601b9bd2903f761f043f0d438033bd5 (patch) | |
tree | 78db6905b7be503e0e81f8f63658e3cd13bdd908 /meta-oe/recipes-support/libutempter/libutempter | |
parent | a5e8a79f04164d63e1a87f495c3dd766bd7b6df8 (diff) | |
download | meta-openembedded-contrib-da4dab68d601b9bd2903f761f043f0d438033bd5.tar.gz |
libutempter: Fix compile error
| iface.c: In function 'utempter_add_record':
| <command-line>:0:12: error: expected expression before '/' token
| iface.c:46:35: note: in expansion of macro 'LIBEXECDIR'
| #define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter"
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/libutempter/libutempter')
-rw-r--r-- | meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch b/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch new file mode 100644 index 0000000000..8140ea3438 --- /dev/null +++ b/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch @@ -0,0 +1,36 @@ +From fc2bd592ad17d1c2a2a989750e69dfaedc28c633 Mon Sep 17 00:00:00 2001 +From: Qian Lei <qianl.fnst@cn.fujitsu.com> +Date: Fri, 9 Jan 2015 10:40:29 +0800 +Subject: [PATCH] Fix macro error + +compile error when build on almost all architectures. + +Upstream-Status: Pending +Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> +--- + iface.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/iface.c b/iface.c +index 5951d81..27793f0 100644 +--- a/iface.c ++++ b/iface.c +@@ -43,7 +43,14 @@ + __result; })) + #endif + +-#define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter" ++#ifdef LIBEXECDIR ++# define CAT_PATH(DIR1,DIR2) DIR1##DIR2 ++# define RAW_UTEMPTER_PATH CAT_PATH(LIBEXECDIR,/utempter/utempter) ++#else ++# define RAW_UTEMPTER_PATH /usr/lib/libtempter/utempter/utempter ++#endif ++#define STR_PATH(RAW_STR) #RAW_STR ++#define UTEMPTER_DEFAULT_PATHNAME STR_PATH(RAW_UTEMPTER_PATH) + + static const char *utempter_pathname; + static int saved_fd = -1; +-- +1.8.3.1 + |