| 1 |
radhermit 13/12/25 06:48:30 |
| 2 |
|
| 3 |
Added: multipath-tools-0.5.0-makefile.patch |
| 4 |
Log: |
| 5 |
Version bump (bug #495268). |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: multipath-tools-0.5.0-makefile.patch |
| 16 |
=================================================================== |
| 17 |
--- multipath-tools-0.5.0/kpartx/Makefile |
| 18 |
+++ multipath-tools-0.5.0/kpartx/Makefile |
| 19 |
@@ -12,7 +12,7 @@ |
| 20 |
CFLAGS += -DLIBDM_API_COOKIE |
| 21 |
endif |
| 22 |
|
| 23 |
-LDFLAGS = -ldevmapper |
| 24 |
+LIBS = -ldevmapper |
| 25 |
OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ |
| 26 |
gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o |
| 27 |
EXEC = kpartx |
| 28 |
@@ -20,8 +20,7 @@ |
| 29 |
all: $(EXEC) |
| 30 |
|
| 31 |
$(EXEC): $(OBJS) |
| 32 |
- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) |
| 33 |
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz |
| 34 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) |
| 35 |
|
| 36 |
install: $(EXEC) $(EXEC).8 |
| 37 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) |
| 38 |
@@ -29,14 +28,15 @@ |
| 39 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) |
| 40 |
$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) |
| 41 |
$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d |
| 42 |
- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ |
| 43 |
+ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules |
| 44 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) |
| 45 |
- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) |
| 46 |
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) |
| 47 |
|
| 48 |
uninstall: |
| 49 |
rm -f $(DESTDIR)$(bindir)/$(EXEC) |
| 50 |
- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz |
| 51 |
+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 |
| 52 |
rm -f $(DESTDIR)$(libudevdir)/kpartx_id |
| 53 |
+ rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules |
| 54 |
|
| 55 |
clean: |
| 56 |
- rm -f core *.o $(EXEC) *.gz |
| 57 |
+ rm -f core *.o $(EXEC) |
| 58 |
--- multipath-tools-0.5.0/libmpathpersist/Makefile |
| 59 |
+++ multipath-tools-0.5.0/libmpathpersist/Makefile |
| 60 |
@@ -22,8 +22,6 @@ |
| 61 |
$(CC) -Wall -fPIC -c $(CFLAGS) *.c |
| 62 |
$(CC) -shared $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS) |
| 63 |
ln -s $(LIBS) $(DEVLIB) |
| 64 |
- $(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz |
| 65 |
- $(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz |
| 66 |
|
| 67 |
install: $(LIBS) |
| 68 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) |
| 69 |
@@ -31,19 +29,17 @@ |
| 70 |
$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir) |
| 71 |
$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir) |
| 72 |
$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/include/ |
| 73 |
- $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/share/doc/mpathpersist/ |
| 74 |
- ln -sf $(DESTDIR)$(syslibdir)/$(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB) |
| 75 |
- install -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir) |
| 76 |
- install -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir) |
| 77 |
- install -m 644 mpath_persist.h $(DESTDIR)/usr/include/ |
| 78 |
+ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir) |
| 79 |
+ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir) |
| 80 |
+ $(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)/usr/include/ |
| 81 |
|
| 82 |
uninstall: |
| 83 |
rm -f $(DESTDIR)$(syslibdir)/$(LIBS) |
| 84 |
- rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3.gz |
| 85 |
- rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3.gz |
| 86 |
+ rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3 |
| 87 |
+ rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3 |
| 88 |
|
| 89 |
clean: |
| 90 |
rm -f core *.a *.o |
| 91 |
rm -f libmpathpersist.so.0 |
| 92 |
rm -f libmpathpersist.so |
| 93 |
- rm -f mpath_persistent_reserve_in.3.gz mpath_persistent_reserve_out.3.gz |
| 94 |
+ rm -f mpath_persistent_reserve_in.3 mpath_persistent_reserve_out.3 |
| 95 |
--- multipath-tools-0.5.0/Makefile.inc |
| 96 |
+++ multipath-tools-0.5.0/Makefile.inc |
| 97 |
@@ -48,8 +48,8 @@ |
| 98 |
RPM_OPT_FLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 |
| 99 |
endif |
| 100 |
|
| 101 |
-OPTFLAGS = $(RPM_OPT_FLAGS) -Wunused -Wstrict-prototypes |
| 102 |
-CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" |
| 103 |
+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes |
| 104 |
+CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" |
| 105 |
SHARED_FLAGS = -shared |
| 106 |
|
| 107 |
%.o: %.c |
| 108 |
--- multipath-tools-0.5.0/mpathpersist/Makefile |
| 109 |
+++ multipath-tools-0.5.0/mpathpersist/Makefile |
| 110 |
@@ -13,18 +13,17 @@ |
| 111 |
|
| 112 |
$(EXEC): $(OBJS) |
| 113 |
$(CC) -g $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) |
| 114 |
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz |
| 115 |
|
| 116 |
install: |
| 117 |
install -d $(DESTDIR)$(bindir) |
| 118 |
install -m 755 $(EXEC) $(DESTDIR)$(bindir)/ |
| 119 |
install -d $(DESTDIR)$(mandir) |
| 120 |
- install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) |
| 121 |
+ install -m 644 $(EXEC).8 $(DESTDIR)$(mandir) |
| 122 |
|
| 123 |
clean: |
| 124 |
rm -f *.o $(EXEC) |
| 125 |
- rm -f mpathpersist.8.gz |
| 126 |
+ rm -f mpathpersist.8 |
| 127 |
|
| 128 |
uninstall: |
| 129 |
rm $(DESTDIR)$(bindir)/$(EXEC) |
| 130 |
- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz |
| 131 |
+ rm $(DESTDIR)$(mandir)/$(EXEC).8 |
| 132 |
--- multipath-tools-0.5.0/multipath/Makefile |
| 133 |
+++ multipath-tools-0.5.0/multipath/Makefile |
| 134 |
@@ -7,29 +7,27 @@ |
| 135 |
OBJS = main.o |
| 136 |
|
| 137 |
CFLAGS += -I$(multipathdir) |
| 138 |
-LDFLAGS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev |
| 139 |
+LIBS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev |
| 140 |
|
| 141 |
EXEC = multipath |
| 142 |
|
| 143 |
all: $(EXEC) |
| 144 |
|
| 145 |
$(EXEC): $(OBJS) |
| 146 |
- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) |
| 147 |
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz |
| 148 |
- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz |
| 149 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) |
| 150 |
|
| 151 |
install: |
| 152 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) |
| 153 |
$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ |
| 154 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) |
| 155 |
- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) |
| 156 |
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) |
| 157 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) |
| 158 |
- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) |
| 159 |
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) |
| 160 |
|
| 161 |
uninstall: |
| 162 |
rm $(DESTDIR)$(bindir)/$(EXEC) |
| 163 |
- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz |
| 164 |
- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz |
| 165 |
+ rm $(DESTDIR)$(mandir)/$(EXEC).8 |
| 166 |
+ rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5 |
| 167 |
|
| 168 |
clean: |
| 169 |
- rm -f core *.o $(EXEC) *.gz |
| 170 |
+ rm -f core *.o $(EXEC) |
| 171 |
--- multipath-tools-0.5.0/multipathd/Makefile |
| 172 |
+++ multipath-tools-0.5.0/multipathd/Makefile |
| 173 |
@@ -9,11 +9,11 @@ |
| 174 |
ifdef SYSTEMD |
| 175 |
CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD) |
| 176 |
endif |
| 177 |
-LDFLAGS += -lpthread -ldevmapper -lreadline |
| 178 |
+LIBS += -lpthread -ldevmapper -lreadline |
| 179 |
ifdef SYSTEMD |
| 180 |
- LDFLAGS += -lsystemd-daemon |
| 181 |
+ LIBS += -lsystemd-daemon |
| 182 |
endif |
| 183 |
-LDFLAGS += -ludev -ldl \ |
| 184 |
+LIBS += -ludev -ldl \ |
| 185 |
-L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist |
| 186 |
|
| 187 |
# |
| 188 |
@@ -35,8 +35,7 @@ |
| 189 |
all : $(EXEC) |
| 190 |
|
| 191 |
$(EXEC): $(OBJS) |
| 192 |
- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) |
| 193 |
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz |
| 194 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) |
| 195 |
|
| 196 |
install: |
| 197 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) |
| 198 |
@@ -48,15 +47,15 @@ |
| 199 |
$(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir) |
| 200 |
endif |
| 201 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) |
| 202 |
- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) |
| 203 |
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) |
| 204 |
|
| 205 |
uninstall: |
| 206 |
rm -f $(DESTDIR)$(bindir)/$(EXEC) |
| 207 |
rm -f $(DESTDIR)$(rcdir)/$(EXEC) |
| 208 |
- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz |
| 209 |
+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 |
| 210 |
rm -f $(DESTDIR)$(unitdir)/$(EXEC).service |
| 211 |
rm -f $(DESTDIR)$(unitdir)/$(EXEC).socket |
| 212 |
|
| 213 |
clean: |
| 214 |
- rm -f core *.o $(EXEC) *.gz |
| 215 |
+ rm -f core *.o $(EXEC) |
Archives