mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

lvm2: Fix patch errors found with musl

Browse Source 
The patches had syntax errors which are only
visible when using musl libs

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2017-03-22 14:13:42 -07:00
committed by Martin Jansa
parent 10e27be997
commit 3ad787c673
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch
+6 -7
View File
@@ -1,7 +1,7 @@
From ede7976da9431573b0104dbcfe91a32c02dbea13 Mon Sep 17 00:00:00 2001
From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001
From: Dengke Du <dengke.du@windriver.com>
Date: Tue, 25 Oct 2016 11:49:40 +0000
Subject: [PATCH 1/4] implement libc specific reopen_stream
Subject: [PATCH] implement libc specific reopen_stream
musl defines stdin/stdio/stderr as constant types which means
we can not assign to them as we are doing here but works ok with glibc
@@ -13,15 +13,14 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Dengke Du <dengke.du@windriver.com>
---
Upstream-Status: Pending
---
lib/log/log.c | 6 ++++++
tools/lvmcmdline.c | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/log/log.c b/lib/log/log.c
index c933154..638839d 100644
index c933154..3581084 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -161,6 +161,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_
@@ -38,7 +37,7 @@ index c933154..638839d 100644
}
+#else
+{
+ return (freopen(NULL, mode, *stream) != NULL)
+ return (freopen(NULL, mode, *stream) != NULL);
+}
+#endif
@@ -76,5 +75,5 @@ index 9a4deb7..f1f18e6 100644
strerror(errno));
return 0;
--
2.9.3
2.12.0
meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch
+6 -7
View File
@@ -1,20 +1,19 @@
From 8706a6d33753d8b2cf5bb2a12bd6880b371ce337 Mon Sep 17 00:00:00 2001
From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001
From: Dengke Du <dengke.du@windriver.com>
Date: Tue, 25 Oct 2016 11:52:44 +0000
Subject: [PATCH 2/4] Guard use of mallinfo() with __GLIBC__
Subject: [PATCH] Guard use of mallinfo() with __GLIBC__
This API is glibc-only
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Dengke Du <dengke.du@windriver.com>
---
Upstream-Status: Pending
---
lib/mm/memlock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c
index da90144..c1bf8fb 100644
index da90144..f34f890 100644
--- a/lib/mm/memlock.c
+++ b/lib/mm/memlock.c
@@ -150,7 +150,7 @@ static void _touch_memory(void *mem, size_t size)
@@ -22,10 +21,10 @@ index da90144..c1bf8fb 100644
static void _allocate_memory(void)
{
-#ifndef VALGRIND_POOL
+#ifndef VALGRIND_POOL && defined(__GLIBC__)
+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
void *stack_mem;
struct rlimit limit;
int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks;
--
2.9.3
2.12.0