| 1 |
radhermit 10/10/28 06:28:41 |
| 2 |
|
| 3 |
Added: multipath-tools-0.4.9-build.patch |
| 4 |
Log: |
| 5 |
Version bump (bug #321331 by Krzysiek). Update build patch and remove patches applied upstream, remove -j1 limitation, and use emake instead of make. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc98/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: multipath-tools-0.4.9-build.patch |
| 16 |
=================================================================== |
| 17 |
--- multipath-tools-0.4.9.orig/kpartx/Makefile 2010-05-22 05:01:58.000000000 -0700 |
| 18 |
+++ multipath-tools-0.4.9/kpartx/Makefile 2010-10-22 00:48:25.615627572 -0700 |
| 19 |
@@ -6,7 +6,7 @@ |
| 20 |
|
| 21 |
CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
| 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 crc32.o lopart.o xstrncpy.o devmapper.o |
| 27 |
EXEC = kpartx |
| 28 |
@@ -14,8 +14,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 |
@@ -23,13 +22,14 @@ |
| 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)/etc/udev/rules.d/66-kpartx.rules |
| 53 |
|
| 54 |
clean: |
| 55 |
- rm -f core *.o $(EXEC) *.gz |
| 56 |
+ rm -f core *.o $(EXEC) |
| 57 |
--- multipath-tools-0.4.9.orig/Makefile.inc 2010-05-22 05:01:58.000000000 -0700 |
| 58 |
+++ multipath-tools-0.4.9/Makefile.inc 2010-10-21 23:51:12.768868148 -0700 |
| 59 |
@@ -32,11 +32,10 @@ |
| 60 |
syslibdir = $(prefix)/$(LIB) |
| 61 |
libdir = $(prefix)/$(LIB)/multipath |
| 62 |
|
| 63 |
-GZIP = /bin/gzip -9 -c |
| 64 |
INSTALL_PROGRAM = install |
| 65 |
|
| 66 |
-OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes |
| 67 |
-CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" |
| 68 |
+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes |
| 69 |
+CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" |
| 70 |
SHARED_FLAGS = -shared |
| 71 |
|
| 72 |
%.o: %.c |
| 73 |
--- multipath-tools-0.4.9.orig/multipath/Makefile 2010-05-22 05:01:58.000000000 -0700 |
| 74 |
+++ multipath-tools-0.4.9/multipath/Makefile 2010-10-22 00:47:13.952010117 -0700 |
| 75 |
@@ -7,32 +7,30 @@ |
| 76 |
OBJS = main.o |
| 77 |
|
| 78 |
CFLAGS += -I$(multipathdir) |
| 79 |
-LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) |
| 80 |
+LIBS = -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) |
| 81 |
|
| 82 |
EXEC = multipath |
| 83 |
|
| 84 |
all: $(EXEC) |
| 85 |
|
| 86 |
$(EXEC): $(OBJS) |
| 87 |
- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) |
| 88 |
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz |
| 89 |
- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz |
| 90 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) |
| 91 |
|
| 92 |
install: |
| 93 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) |
| 94 |
$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ |
| 95 |
$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d |
| 96 |
- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ |
| 97 |
+ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules |
| 98 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) |
| 99 |
- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) |
| 100 |
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) |
| 101 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) |
| 102 |
- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) |
| 103 |
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) |
| 104 |
|
| 105 |
uninstall: |
| 106 |
- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules |
| 107 |
- rm $(DESTDIR)$(bindir)/$(EXEC) |
| 108 |
- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz |
| 109 |
- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz |
| 110 |
+ rm -f $(DESTDIR)/etc/udev/rules.d/65-multipath.rules |
| 111 |
+ rm -f $(DESTDIR)$(bindir)/$(EXEC) |
| 112 |
+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 |
| 113 |
+ rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5 |
| 114 |
|
| 115 |
clean: |
| 116 |
- rm -f core *.o $(EXEC) *.gz |
| 117 |
+ rm -f core *.o $(EXEC) |
| 118 |
--- multipath-tools-0.4.9.orig/multipathd/Makefile 2010-05-22 05:01:58.000000000 -0700 |
| 119 |
+++ multipath-tools-0.4.9/multipathd/Makefile 2010-10-22 00:48:02.502428428 -0700 |
| 120 |
@@ -6,7 +6,7 @@ |
| 121 |
# basic flags setting |
| 122 |
# |
| 123 |
CFLAGS += -I$(multipathdir) |
| 124 |
-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ |
| 125 |
+LIBS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ |
| 126 |
-lmultipath -L$(multipathdir) |
| 127 |
|
| 128 |
# |
| 129 |
@@ -28,21 +28,20 @@ |
| 130 |
all : $(EXEC) |
| 131 |
|
| 132 |
$(EXEC): $(OBJS) |
| 133 |
- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) |
| 134 |
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz |
| 135 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) |
| 136 |
|
| 137 |
install: |
| 138 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) |
| 139 |
$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) |
| 140 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) |
| 141 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) |
| 142 |
- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) |
| 143 |
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) |
| 144 |
|
| 145 |
uninstall: |
| 146 |
rm -f $(DESTDIR)$(bindir)/$(EXEC) |
| 147 |
rm -f $(DESTDIR)$(rcdir)/$(EXEC) |
| 148 |
- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz |
| 149 |
+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 |
| 150 |
|
| 151 |
clean: |
| 152 |
- rm -f core *.o $(EXEC) *.gz |
| 153 |
+ rm -f core *.o $(EXEC) |
Archives