lvm Makefile was defining $(STRIP) (issue #174)

This commit is contained in:
Trammell Hudson 2017-04-08 13:21:14 -04:00
parent c262de30a4
commit ae6bed14a2
Failed to extract signature

View File

@ -1,6 +1,6 @@
diff -u --recursive ../clean/LVM2.2.02.168/lib/mm/memlock.c LVM2.2.02.168/lib/mm/memlock.c
--- ../clean/LVM2.2.02.168/lib/mm/memlock.c 2016-11-30 18:17:29.000000000 -0500
+++ LVM2.2.02.168/lib/mm/memlock.c 2017-04-03 11:31:02.690049009 -0400
+++ LVM2.2.02.168/lib/mm/memlock.c 2017-04-08 11:42:57.625608016 -0400
@@ -150,6 +150,7 @@
static void _allocate_memory(void)
@ -19,7 +19,7 @@ diff -u --recursive ../clean/LVM2.2.02.168/lib/mm/memlock.c LVM2.2.02.168/lib/mm
static void _release_memory(void)
diff -u --recursive ../clean/LVM2.2.02.168/libdm/libdm-stats.c LVM2.2.02.168/libdm/libdm-stats.c
--- ../clean/LVM2.2.02.168/libdm/libdm-stats.c 2016-11-30 18:17:30.000000000 -0500
+++ LVM2.2.02.168/libdm/libdm-stats.c 2017-04-03 11:28:41.852392488 -0400
+++ LVM2.2.02.168/libdm/libdm-stats.c 2017-04-08 11:42:57.625608016 -0400
@@ -17,7 +17,24 @@
#include "dmlib.h"
@ -83,7 +83,7 @@ diff -u --recursive ../clean/LVM2.2.02.168/libdm/libdm-stats.c LVM2.2.02.168/lib
buflen++;
diff -u --recursive ../clean/LVM2.2.02.168/libdm/Makefile.in LVM2.2.02.168/libdm/Makefile.in
--- ../clean/LVM2.2.02.168/libdm/Makefile.in 2016-11-30 18:17:30.000000000 -0500
+++ LVM2.2.02.168/libdm/Makefile.in 2017-04-03 11:28:41.856392534 -0400
+++ LVM2.2.02.168/libdm/Makefile.in 2017-04-08 11:42:57.625608016 -0400
@@ -56,7 +56,8 @@
CFLAGS += $(UDEV_CFLAGS) $(VALGRIND_CFLAGS)
@ -94,9 +94,32 @@ diff -u --recursive ../clean/LVM2.2.02.168/libdm/Makefile.in LVM2.2.02.168/libdm
device-mapper: all
diff -u --recursive ../clean/LVM2.2.02.168/make.tmpl.in LVM2.2.02.168/make.tmpl.in
--- ../clean/LVM2.2.02.168/make.tmpl.in 2016-11-30 18:17:30.000000000 -0500
+++ LVM2.2.02.168/make.tmpl.in 2017-04-08 11:55:50.807603236 -0400
@@ -142,7 +142,7 @@
M_INSTALL_PROGRAM = -m 555
M_INSTALL_DATA = -m 444
endif
-INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP)
+INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP_ARG)
INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA)
INSTALL_WDATA = $(INSTALL) -p -m 644
@@ -260,8 +260,8 @@
#CFLAGS += -pg
#LDFLAGS += -pg
-STRIP=
-#STRIP = -s
+STRIP_ARG=
+#STRIP_ARG = -s
LVM_VERSION := $(shell cat $(top_srcdir)/VERSION)
diff -u --recursive ../clean/LVM2.2.02.168/tools/lvmcmdline.c LVM2.2.02.168/tools/lvmcmdline.c
--- ../clean/LVM2.2.02.168/tools/lvmcmdline.c 2016-11-30 18:17:32.000000000 -0500
+++ LVM2.2.02.168/tools/lvmcmdline.c 2017-04-03 11:36:26.781878449 -0400
+++ LVM2.2.02.168/tools/lvmcmdline.c 2017-04-08 11:42:57.629608042 -0400
@@ -1817,6 +1817,7 @@
{
int err = is_valid_fd(STDERR_FILENO);