]>
Commit | Line | Data |
---|---|---|
289c5516 MT |
1 | --- |
2 | Makefile.inc | 9 +++++---- | |
3 | kpartx/Makefile | 2 +- | |
4 | libmpathpersist/Makefile | 4 ++-- | |
5 | libmultipath/Makefile | 1 + | |
6 | libmultipath/checkers/Makefile | 2 +- | |
7 | libmultipath/prioritizers/Makefile | 2 +- | |
8 | multipath/Makefile | 2 +- | |
9 | multipathd/Makefile | 5 +++-- | |
10 | 8 files changed, 15 insertions(+), 12 deletions(-) | |
11 | ||
12 | Index: multipath-tools-130222/Makefile.inc | |
13 | =================================================================== | |
14 | --- multipath-tools-130222.orig/Makefile.inc | |
15 | +++ multipath-tools-130222/Makefile.inc | |
16 | @@ -23,15 +23,15 @@ endif | |
17 | ||
18 | prefix = | |
19 | exec_prefix = $(prefix) | |
20 | -bindir = $(exec_prefix)/sbin | |
21 | +bindir = $(exec_prefix)/usr/sbin | |
22 | libudevdir = ${prefix}/lib/udev | |
23 | multipathdir = $(TOPDIR)/libmultipath | |
24 | mandir = $(prefix)/usr/share/man/man8 | |
25 | man5dir = $(prefix)/usr/share/man/man5 | |
26 | man3dir = $(prefix)/usr/share/man/man3 | |
27 | rcdir = $(prefix)/etc/rc.d/init.d | |
28 | -syslibdir = $(prefix)/$(LIB) | |
29 | -libdir = $(prefix)/$(LIB)/multipath | |
30 | +syslibdir = $(prefix)/usr/$(LIB) | |
31 | +libdir = $(prefix)/usr/$(LIB)/multipath | |
32 | unitdir = $(prefix)/lib/systemd/system | |
33 | mpathpersistdir = $(TOPDIR)/libmpathpersist | |
34 | ||
35 | @@ -42,8 +42,9 @@ ifndef RPM_OPT_FLAGS | |
36 | RPM_OPT_FLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 | |
37 | endif | |
38 | ||
39 | +LDFLAGS += -Wl,-z,relro | |
40 | OPTFLAGS = $(RPM_OPT_FLAGS) -Wunused -Wstrict-prototypes | |
41 | -CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" | |
42 | +CFLAGS = $(OPTFLAGS) -DLIB_STRING=\"${LIB}\" | |
43 | SHARED_FLAGS = -shared | |
44 | ||
45 | %.o: %.c | |
46 | Index: multipath-tools-130222/multipathd/Makefile | |
47 | =================================================================== | |
48 | --- multipath-tools-130222.orig/multipathd/Makefile | |
49 | +++ multipath-tools-130222/multipathd/Makefile | |
50 | @@ -5,9 +5,10 @@ include ../Makefile.inc | |
51 | # | |
52 | # basic flags setting | |
53 | # | |
54 | -CFLAGS += -I$(multipathdir) -I$(mpathpersistdir) | |
55 | +CFLAGS += -fPIE -DPIE -I$(multipathdir) -I$(mpathpersistdir) | |
56 | LDFLAGS += -lpthread -ldevmapper -lreadline -ludev -ldl \ | |
57 | - -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist | |
58 | + -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist \ | |
59 | + -Wl,-z,now -pie | |
60 | ||
61 | # | |
62 | # debuging stuff | |
63 | Index: multipath-tools-130222/kpartx/Makefile | |
64 | =================================================================== | |
65 | --- multipath-tools-130222.orig/kpartx/Makefile | |
66 | +++ multipath-tools-130222/kpartx/Makefile | |
67 | @@ -4,7 +4,7 @@ | |
68 | # | |
69 | include ../Makefile.inc | |
70 | ||
71 | -CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 | |
72 | +CFLAGS += -fPIC -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 | |
73 | ||
74 | LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' /usr/include/libdevmapper.h) | |
75 | ||
76 | Index: multipath-tools-130222/libmpathpersist/Makefile | |
77 | =================================================================== | |
78 | --- multipath-tools-130222.orig/libmpathpersist/Makefile | |
79 | +++ multipath-tools-130222/libmpathpersist/Makefile | |
80 | @@ -10,7 +10,7 @@ DEVLIB = libmpathpersist.so | |
81 | LIBS = $(DEVLIB).$(SONAME) | |
82 | ||
83 | ||
84 | -CFLAGS += -I$(multipathdir) -I$(mpathpersistdir) | |
85 | +CFLAGS += -fPIC -I$(multipathdir) -I$(mpathpersistdir) | |
86 | LIBDEPS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath | |
87 | ||
88 | OBJS = mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o | |
89 | @@ -19,7 +19,7 @@ all: $(LIBS) | |
90 | ||
91 | ||
92 | $(LIBS): | |
93 | - $(CC) -Wall -fPIC -c $(CFLAGS) *.c | |
94 | + $(CC) -Wall -c $(CFLAGS) *.c | |
95 | $(CC) -shared $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS) | |
96 | ln -s $(LIBS) $(DEVLIB) | |
97 | $(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz | |
98 | Index: multipath-tools-130222/libmultipath/Makefile | |
99 | =================================================================== | |
100 | --- multipath-tools-130222.orig/libmultipath/Makefile | |
101 | +++ multipath-tools-130222/libmultipath/Makefile | |
102 | @@ -8,6 +8,7 @@ SONAME=0 | |
103 | DEVLIB = libmultipath.so | |
104 | LIBS = $(DEVLIB).$(SONAME) | |
105 | LIBDEPS = -lpthread -ldl -ldevmapper -ludev | |
106 | +CFLAGS += -fPIC | |
107 | ||
108 | OBJS = memory.o parser.o vector.o devmapper.o \ | |
109 | hwtable.o blacklist.o util.o dmparser.o config.o \ | |
110 | Index: multipath-tools-130222/libmultipath/checkers/Makefile | |
111 | =================================================================== | |
112 | --- multipath-tools-130222.orig/libmultipath/checkers/Makefile | |
113 | +++ multipath-tools-130222/libmultipath/checkers/Makefile | |
114 | @@ -14,7 +14,7 @@ LIBS= \ | |
115 | libcheckhp_sw.so \ | |
116 | libcheckrdac.so | |
117 | ||
118 | -CFLAGS += -I.. | |
119 | +CFLAGS += -fPIC -I.. | |
120 | ||
121 | all: $(LIBS) | |
122 | ||
123 | Index: multipath-tools-130222/libmultipath/prioritizers/Makefile | |
124 | =================================================================== | |
125 | --- multipath-tools-130222.orig/libmultipath/prioritizers/Makefile | |
126 | +++ multipath-tools-130222/libmultipath/prioritizers/Makefile | |
127 | @@ -17,7 +17,7 @@ LIBS = \ | |
128 | libprioweightedpath.so \ | |
129 | libprioiet.so | |
130 | ||
131 | -CFLAGS += -I.. | |
132 | +CFLAGS += -fPIC -I.. | |
133 | ||
134 | all: $(LIBS) | |
135 | ||
136 | Index: multipath-tools-130222/multipath/Makefile | |
137 | =================================================================== | |
138 | --- multipath-tools-130222.orig/multipath/Makefile | |
139 | +++ multipath-tools-130222/multipath/Makefile | |
140 | @@ -6,7 +6,7 @@ include ../Makefile.inc | |
141 | ||
142 | OBJS = main.o | |
143 | ||
144 | -CFLAGS += -I$(multipathdir) | |
145 | +CFLAGS += -fPIC -I$(multipathdir) | |
146 | LDFLAGS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath | |
147 | ||
148 | EXEC = multipath |