Print this page
9709 Remove support for BZIP2 from dump
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/savecore/Makefile.com
+++ new/usr/src/cmd/savecore/Makefile.com
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
|
↓ open down ↓ |
12 lines elided |
↑ open up ↑ |
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21 #
22 22 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
23 +# Copyright 2018 Nexenta Systems, Inc. All rights reserved.
23 24 #
24 25
25 26 PROG= savecore
26 27 SRCS= ../savecore.c ../../../uts/common/os/compress.c
27 28 OBJS= savecore.o compress.o
28 29
29 30 include ../../Makefile.cmd
30 31
31 32 CSTD = $(CSTD_GNU99)
32 33
33 34 CFLAGS += $(CCVERBOSE)
34 35 CFLAGS64 += $(CCVERBOSE)
35 -CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -DBZ_NO_STDIO -I$(SRC)/uts/common
36 +CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -I$(SRC)/uts/common
36 37
37 -#
38 -# savecore is compiled with bits from $(SRC)/common/bzip2 and some function
39 -# symbols there are defined as weak; if you leave them out of
40 -# savecore.c it will compile, but trying to call that function
41 -# will jump to 0. So we use -ztext to avoid that.
42 -#
43 -LDFLAGS += -ztext
44 -
45 -BZIP2OBJS = bz2blocksort.o \
46 - bz2compress.o \
47 - bz2decompress.o \
48 - bz2randtable.o \
49 - bz2bzlib.o \
50 - bz2crctable.o \
51 - bz2huffman.o
52 -
53 38 .KEEP_STATE:
54 39
55 40 all: $(PROG)
56 41
57 -$(PROG): $(OBJS) $(BZIP2OBJS)
58 - $(LINK.c) -o $(PROG) $(OBJS) $(BZIP2OBJS) $(LDLIBS)
42 +$(PROG): $(OBJS)
43 + $(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS)
59 44 $(POST_PROCESS)
60 45
61 46 clean:
62 - $(RM) $(OBJS) $(BZIP2OBJS)
47 + $(RM) $(OBJS)
63 48
64 -lint := CPPFLAGS += -I$(SRC)/common
65 -
66 49 #
67 -# Linting the usr/src/common/bzip2 source produces reams of complaints.
68 -# So we only lint regular SRCS, but we need to excuse two complaints
69 -# related to bz_internal_error.
50 +# savecore only uses the decompress() path of compress.c
51 +# suppress complaints about unused compress() path
70 52 #
53 +lint := LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
54 +lint := LINTFLAGS64 += -erroff=E_NAME_DEF_NOT_USED2
71 55
72 -lint := BZ2LINTCOPOUTS = -erroff=E_NAME_USED_NOT_DEF2
73 -lint := BZ2LINTCOPOUTS += -erroff=E_NAME_DEF_NOT_USED2
74 -
75 -lint := LINTFLAGS += $(BZ2LINTCOPOUTS)
76 -lint := LINTFLAGS64 += $(BZ2LINTCOPOUTS)
77 -
78 56 lint: $(LINTSRCS)
79 57 $(LINT.c) $(SRCS) $(LDLIBS)
80 58
81 59 include ../../Makefile.targ
82 60
83 61 %.o: ../%.c
84 62 $(COMPILE.c) -I$(SRC)/common $<
85 63 $(POST_PROCESS_O)
86 64
87 65 %.o: ../../../uts/common/os/%.c
88 66 $(COMPILE.c) $<
89 - $(POST_PROCESS_O)
90 -
91 -bz2%.o: ../../../common/bzip2/%.c
92 - $(COMPILE.c) -o $@ -I$(SRC)/common -I$(SRC)/common/bzip2 $<
93 67 $(POST_PROCESS_O)
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX