mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-05 15:58:08 +00:00
9aed371228
License-Update: Whitespace removal [1] Drop glibc assumptions patch its fixed upstream [1] https://git.altlinux.org/people/ldv/packages/libutempter.git?p=libutempter.git;a=blobdiff;f=libutempter/COPYING;h=5522aa5f33e23eb2be04b0c1fe789b609e7961fe;hp=2d2d780e6014b850ca3b8437452e24eba5f96508;hb=10539e43e615225da8351895668e704726ffcb53;hpb=3e657409d46e0571f44970ebcd2c972b60778ec3 Signed-off-by: Khem Raj <raj.khem@gmail.com>
32 lines
973 B
Diff
32 lines
973 B
Diff
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(-)
|
|
|
|
--- 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;
|