Browse Source

lvm2: fix build with musl

stdin, stderr and stdout are constants on musl and it doesn't provide
mallinfo.
Both, overwriting std* were used to catch and work around various
misbehaviours of glibc, so it's hopefully save to just skip them when
building against other libc implementations.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
lilik-openwrt-22.03
Daniel Golle 10 years ago
parent
commit
f5cc8c27d7
2 changed files with 71 additions and 0 deletions
  1. +58
    -0
      utils/lvm2/patches/002-const-stdio.patch
  2. +13
    -0
      utils/lvm2/patches/003-no-mallinfo.patch

+ 58
- 0
utils/lvm2/patches/002-const-stdio.patch View File

@ -0,0 +1,58 @@
Index: LVM2.2.02.118/lib/commands/toolcontext.c
===================================================================
--- LVM2.2.02.118.orig/lib/commands/toolcontext.c
+++ LVM2.2.02.118/lib/commands/toolcontext.c
@@ -1625,8 +1625,10 @@ struct cmd_context *create_toolcontext(u
unsigned threaded)
{
struct cmd_context *cmd;
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
FILE *new_stream;
int flags;
+#endif
#ifdef M_MMAP_MAX
mallopt(M_MMAP_MAX, 0);
@@ -1662,7 +1664,7 @@ struct cmd_context *create_toolcontext(u
/* FIXME Make this configurable? */
reset_lvm_errno(1);
-#ifndef VALGRIND_POOL
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
/* Set in/out stream buffering before glibc */
if (set_buffering) {
/* Allocate 2 buffers */
@@ -2035,7 +2037,7 @@ void destroy_toolcontext(struct cmd_cont
if (cmd->libmem)
dm_pool_destroy(cmd->libmem);
-#ifndef VALGRIND_POOL
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
if (cmd->linebuffer) {
/* Reset stream buffering to defaults */
if (is_valid_fd(STDIN_FILENO) &&
Index: LVM2.2.02.118/tools/lvmcmdline.c
===================================================================
--- LVM2.2.02.118.orig/tools/lvmcmdline.c
+++ LVM2.2.02.118/tools/lvmcmdline.c
@@ -1602,6 +1602,7 @@ int lvm_split(char *str, int *argc, char
/* Make sure we have always valid filedescriptors 0,1,2 */
static int _check_standard_fds(void)
{
+#ifdef __GLIBC__
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
@@ -1628,6 +1629,12 @@ static int _check_standard_fds(void)
strerror(errno));
return 0;
}
+#else
+ if (!is_valid_fd(STDERR_FILENO) ||
+ !is_valid_fd(STDOUT_FILENO) ||
+ !is_valid_fd(STDIN_FILENO))
+ return 0;
+#endif
return 1;
}

+ 13
- 0
utils/lvm2/patches/003-no-mallinfo.patch View File

@ -0,0 +1,13 @@
Index: LVM2.2.02.118/lib/mm/memlock.c
===================================================================
--- LVM2.2.02.118.orig/lib/mm/memlock.c
+++ LVM2.2.02.118/lib/mm/memlock.c
@@ -137,7 +137,7 @@ static void _touch_memory(void *mem, siz
static void _allocate_memory(void)
{
-#ifndef VALGRIND_POOL
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
void *stack_mem;
struct rlimit limit;
int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks;

Loading…
Cancel
Save