lvm2: Added another musl patch.

This commit is contained in:
Dylan Araps 2019-06-23 08:56:28 +03:00
parent 2b533786e1
commit d41afadacc
4 changed files with 52 additions and 0 deletions

View File

@ -1,6 +1,7 @@
#!/bin/sh -e
patch -p1 < portability.patch
patch -p1 < fix-stdio-usage.patch
./configure \
--prefix=/usr \

View File

@ -1,2 +1,3 @@
d12da937ce5c0753d4ea8b5215afaa3b12061ea961268693e24e81b19918f514 LVM2.2.02.184.tgz
d1f78c5a07f0ba66856e00e498c0f62164cabbcd9f0d9abcda1c25501eb235ff portability.patch
a15546fefd675fd6282683e93b41a5350b4e58e090f881b1a2807b44a4a5bd11 fix-stdio-usage.patch

View File

@ -0,0 +1,49 @@
--- ./tools/lvmcmdline.c
+++ ./tools/lvmcmdline.c
@@ -1252,7 +1252,7 @@
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
- !(stdin = fopen(_PATH_DEVNULL, "r"))) {
+ !freopen(_PATH_DEVNULL, "r", stdin)) {
if (err)
perror("stdin stream open");
else
@@ -1262,7 +1262,7 @@
}
if (!is_valid_fd(STDOUT_FILENO) &&
- !(stdout = fopen(_PATH_DEVNULL, "w"))) {
+ !freopen(_PATH_DEVNULL, "w", stdout)) {
if (err)
perror("stdout stream open");
/* else no stdout */
@@ -1270,7 +1270,7 @@
}
if (!is_valid_fd(STDERR_FILENO) &&
- !(stderr = fopen(_PATH_DEVNULL, "w"))) {
+ !freopen(_PATH_DEVNULL, "w", stderr)) {
printf("stderr stream open: %s\n",
strerror(errno));
return 0;
--- ./lib/commands/toolcontext.c.orig
+++ ./lib/commands/toolcontext.c
@@ -1860,7 +1860,7 @@
/* FIXME Make this configurable? */
reset_lvm_errno(1);
-#ifndef VALGRIND_POOL
+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
/* Set in/out stream buffering before glibc */
if (set_buffering
#ifdef SYS_gettid
@@ -2254,7 +2254,7 @@
if (cmd->libmem)
dm_pool_destroy(cmd->libmem);
-#ifndef VALGRIND_POOL
+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
if (cmd->linebuffer) {
/* Reset stream buffering to defaults */
if (is_valid_fd(STDIN_FILENO) &&

View File

@ -1,2 +1,3 @@
https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.2.02.184.tgz
patches/portability.patch
patches/fix-stdio-usage.patch