Skip to content

recipes-support/libutempter Fix macro concatenation. #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iddinev wants to merge 14 commits into from
Closed

recipes-support/libutempter Fix macro concatenation. #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9deda3b
blueman: update to 2.0.8
sashko Mar 16, 2019
160b366
packagegroup-tools-bluetooth: fix rdepends
sashko Mar 16, 2019
8b5f1fd
igmpproxy: update to 0.2.1
sashko Mar 16, 2019
b8159ea
libev: update to 4.25
sashko Mar 16, 2019
c67f05d
libuv: update to 1.27.0
sashko Mar 16, 2019
f910abb
cppunit: update to 1.14.0
sashko Mar 16, 2019
56cc86c
cxxtest: update to 4.4
sashko Mar 16, 2019
dcfae29
libgtop: 2.38.0 -> 2.40.0
kkang-wr Mar 18, 2019
03ea53d
gvfs: 1.39.92 -> 1.40.0
kkang-wr Mar 18, 2019
51d714c
utilities: Fix build failure with -Werror=maybe-uninitialized
Mar 18, 2019
fe927bc
recipes-support/libutempter: Fix the macro string concatenation.
iddinev Mar 19, 2019
1e0a89b
Merge branch 'libutempter_patch' into master-next
iddinev Mar 19, 2019
563943f
Merge branch 'master-next' into libutempter_patch
iddinev Mar 20, 2019
38089f6
Merge branch 'master-next' of https://github.com/iddinev/meta-openemb…
iddinev Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions meta-oe/recipes-support/libutempter/libutempter.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ PV = "1.1.6-alt2+git${SRCPV}"

SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git \
file://0001-Fix-macro-error.patch \
file://0002-Proper-macro-path-generation.patch \
file://libutempter-remove-glibc-assumption.patch \
"

Expand Down
34 changes: 34 additions & 0 deletions meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From 48b6bcf9f5d8a05eace4bc463c47e8a4715d3000 Mon Sep 17 00:00:00 2001
From: iddinev <[email protected]>
Date: Mon, 18 Mar 2019 15:45:20 +0200
Subject: [PATCH] Proper macro path generation.

Signed-off-by: iddinev <[email protected]>
---
libutempter/iface.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git libutempter/iface.c libutempter/iface.c
index 27793f0..c1c0ee9 100644
--- libutempter/iface.c
+++ libutempter/iface.c
@@ -44,13 +44,12 @@
#endif

#ifdef LIBEXECDIR
-# define CAT_PATH(DIR1,DIR2) DIR1##DIR2
-# define RAW_UTEMPTER_PATH CAT_PATH(LIBEXECDIR,/utempter/utempter)
+# define UTEMPTER_DEFAULT_PATHNAME XSTR_PATH(LIBEXECDIR)"/utempter/utempter"
#else
-# define RAW_UTEMPTER_PATH /usr/lib/libtempter/utempter/utempter
+# define UTEMPTER_DEFAULT_PATHNAME STR_PATH(/usr/lib/libtempter/utempter/utempter)
#endif
#define STR_PATH(RAW_STR) #RAW_STR
-#define UTEMPTER_DEFAULT_PATHNAME STR_PATH(RAW_UTEMPTER_PATH)
+#define XSTR_PATH(STR) STR_PATH(STR)

static const char *utempter_pathname;
static int saved_fd = -1;
--
2.7.4