From cbdffc7ea04d181060f56ca3ebf122552b26b51f Mon Sep 17 00:00:00 2001
From: Mike Snitzer <msnitzer@fedoraproject.org>
Date: Wed, 6 May 2009 20:01:01 +0000
Subject: Updated to latest upstream 0.4.9 code: multipath-tools-090429.tgz
 (git     commit id: 7395bcda3a218df2eab1617df54628af0dc3456e)

---
 linking_change.patch | 68 ----------------------------------------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 linking_change.patch

(limited to 'linking_change.patch')

diff --git a/linking_change.patch b/linking_change.patch
deleted file mode 100644
index 887504a..0000000
--- a/linking_change.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: multipath-tools/libmultipath/Makefile
-===================================================================
---- multipath-tools.orig/libmultipath/Makefile
-+++ multipath-tools/libmultipath/Makefile
-@@ -23,14 +23,15 @@ endif
- all: $(LIBS)
- 
- $(LIBS): $(OBJS)
--	$(CC) $(SHARED_FLAGS) $(CFLAGS) -o $@ $(OBJS)
-+	$(CC) $(SHARED_FLAGS) -Wl,-soname,$@ $(CFLAGS) -o $@ $(OBJS)
- 
- install:
-+	$(INSTALL_PROGRAM) -d $(DESTDIR)$(prefix)/lib
-+	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(prefix)/lib/$(LIBS)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
--	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)/$(LIBS)
- 
- uninstall:
--	rm -f $(DESTDIR)$(libdir)/$(LIBS)
-+	rm -f $(DESTDIR)$(prefix)/lib/$(LIBS)
- 
- clean:
- 	rm -f core *.a *.o *.gz *.so
-Index: multipath-tools/multipath/Makefile
-===================================================================
---- multipath-tools.orig/multipath/Makefile
-+++ multipath-tools/multipath/Makefile
-@@ -6,9 +6,8 @@ include ../Makefile.inc
- 
- OBJS = main.o
- 
--CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir)
--LDFLAGS += -lpthread -ldevmapper -laio -ldl \
--	   -lmultipath -L$(multipathdir)
-+CFLAGS += -I$(multipathdir)
-+LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
- 
- EXEC = multipath
- 
-Index: multipath-tools/multipathd/Makefile
-===================================================================
---- multipath-tools.orig/multipathd/Makefile
-+++ multipath-tools/multipathd/Makefile
-@@ -5,8 +5,8 @@ include ../Makefile.inc
- #
- # basic flags setting
- #
--CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir)
--LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -laio -ldl \
-+CFLAGS += -I$(multipathdir)
-+LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
- 	   -lmultipath -L$(multipathdir)
- 
- #
-Index: multipath-tools/libmultipath/checkers/Makefile
-===================================================================
---- multipath-tools.orig/libmultipath/checkers/Makefile
-+++ multipath-tools/libmultipath/checkers/Makefile
-@@ -17,6 +17,9 @@ CFLAGS += -I..
- 
- all: $(LIBS)
- 
-+libcheckdirectio.so: libsg.o directio.o
-+	$(CC) $(SHARED_FLAGS) -o $@ $^ -laio
-+
- libcheck%.so: libsg.o %.o
- 	$(CC) $(SHARED_FLAGS) -o $@ $^
- 
-- 
cgit