|
@@ -17,10 +17,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
|
Makefile | 45 +++++++++++++++++++++++----------------------
|
|
Makefile | 45 +++++++++++++++++++++++----------------------
|
|
1 file changed, 23 insertions(+), 22 deletions(-)
|
|
1 file changed, 23 insertions(+), 22 deletions(-)
|
|
|
|
|
|
-diff --git a/Makefile b/Makefile
|
|
|
|
-index 1fdb628..5dce589 100644
|
|
|
|
---- a/Makefile
|
|
|
|
-+++ b/Makefile
|
|
|
|
|
|
+Index: git/Makefile
|
|
|
|
+===================================================================
|
|
|
|
+--- git.orig/Makefile
|
|
|
|
++++ git/Makefile
|
|
@@ -8,12 +8,6 @@ ifeq ($(strip $CC),)
|
|
@@ -8,12 +8,6 @@ ifeq ($(strip $CC),)
|
|
CC = gcc
|
|
CC = gcc
|
|
endif
|
|
endif
|
|
@@ -81,12 +81,12 @@ index 1fdb628..5dce589 100644
|
|
SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h
|
|
SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h
|
|
SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c
|
|
SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c
|
|
OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
|
|
OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
|
|
-@@ -52,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
|
|
|
|
|
|
+@@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
|
|
|
|
|
|
LIBS = -ldw -lbz2 -ldl -lelf -lz
|
|
LIBS = -ldw -lbz2 -ldl -lelf -lz
|
|
ifneq ($(LINKTYPE), dynamic)
|
|
ifneq ($(LINKTYPE), dynamic)
|
|
--LIBS := -static $(LIBS)
|
|
|
|
-+LIBS := $(LIBS)
|
|
|
|
|
|
+-LIBS := -static $(LIBS) -llzma
|
|
|
|
++LIBS := $(LIBS) -llzma
|
|
endif
|
|
endif
|
|
|
|
|
|
ifeq ($(USELZO), on)
|
|
ifeq ($(USELZO), on)
|
|
@@ -96,13 +96,16 @@ index 1fdb628..5dce589 100644
|
|
endif
|
|
endif
|
|
|
|
|
|
ifeq ($(USESNAPPY), on)
|
|
ifeq ($(USESNAPPY), on)
|
|
- LIBS := -lsnappy $(LIBS)
|
|
|
|
|
|
+@@ -65,7 +66,7 @@ LIBS := -lsnappy $(LIBS)
|
|
|
|
+ ifneq ($(LINKTYPE), dynamic)
|
|
|
|
+ LIBS := $(LIBS) -lstdc++
|
|
|
|
+ endif
|
|
-CFLAGS += -DUSESNAPPY
|
|
-CFLAGS += -DUSESNAPPY
|
|
+CFLAGS_COMMON += -DUSESNAPPY
|
|
+CFLAGS_COMMON += -DUSESNAPPY
|
|
endif
|
|
endif
|
|
|
|
|
|
LIBS := -lpthread $(LIBS)
|
|
LIBS := -lpthread $(LIBS)
|
|
-@@ -87,14 +88,14 @@ LIBS := $(LIBS) $(call try-run,\
|
|
|
|
|
|
+@@ -90,14 +91,14 @@ LIBS := $(LIBS) $(call try-run,\
|
|
all: makedumpfile
|
|
all: makedumpfile
|
|
|
|
|
|
$(OBJ_PART): $(SRC_PART)
|
|
$(OBJ_PART): $(SRC_PART)
|
|
@@ -119,7 +122,7 @@ index 1fdb628..5dce589 100644
|
|
echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8
|
|
echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8
|
|
grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8
|
|
grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8
|
|
mv temp.8 makedumpfile.8
|
|
mv temp.8 makedumpfile.8
|
|
-@@ -105,7 +106,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
|
|
|
|
|
|
+@@ -108,7 +109,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(
|
|
gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz
|
|
gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz
|
|
|
|
|
|
eppic_makedumpfile.so: extension_eppic.c
|
|
eppic_makedumpfile.so: extension_eppic.c
|
|
@@ -128,6 +131,3 @@ index 1fdb628..5dce589 100644
|
|
|
|
|
|
clean:
|
|
clean:
|
|
rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz
|
|
rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz
|
|
---
|
|
|
|
-2.21.0
|
|
|
|
-
|
|
|