diff options
| author | Benjamin Marzinski <bmarzins@fedoraproject.org> | 2008-09-26 23:28:36 +0000 |
|---|---|---|
| committer | Benjamin Marzinski <bmarzins@fedoraproject.org> | 2008-09-26 23:28:36 +0000 |
| commit | 765b6859467587798b2f96ad85665c13fd8f03ed (patch) | |
| tree | 43cbab29c1df819799b71a358f2d926b41946506 /linking_change.patch | |
| parent | 4fa3700b25f28485679b1caf4a9ff46adbfb8602 (diff) | |
Since libaio is now in /lib, not /usr/lib, multipath no longer needs todevice-mapper-multipath-0_4_8-7_fc10F-10-startF-10-split
statically link against it. Fixed an error with binding file and WWIDs
that include spaces. Cleaned up the messages from the directio checker
function. Fixed the udev rules. Fixed a regression in multipath.conf
parsing Fixed 457530, 457589
Diffstat (limited to 'linking_change.patch')
| -rw-r--r-- | linking_change.patch | 47 |
1 files changed, 33 insertions, 14 deletions
diff --git a/linking_change.patch b/linking_change.patch index 9a8a142..887504a 100644 --- a/linking_change.patch +++ b/linking_change.patch @@ -1,7 +1,7 @@ -Index: multipath-tools-080519/libmultipath/Makefile +Index: multipath-tools/libmultipath/Makefile =================================================================== ---- multipath-tools-080519.orig/libmultipath/Makefile -+++ multipath-tools-080519/libmultipath/Makefile +--- multipath-tools.orig/libmultipath/Makefile ++++ multipath-tools/libmultipath/Makefile @@ -23,14 +23,15 @@ endif all: $(LIBS) @@ -21,29 +21,48 @@ Index: multipath-tools-080519/libmultipath/Makefile clean: rm -f core *.a *.o *.gz *.so -Index: multipath-tools-080519/multipath/Makefile +Index: multipath-tools/multipath/Makefile =================================================================== ---- multipath-tools-080519.orig/multipath/Makefile -+++ multipath-tools-080519/multipath/Makefile -@@ -6,7 +6,7 @@ include ../Makefile.inc +--- 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 -laio -ldl \ - -lmultipath -L$(multipathdir) ++LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) + + EXEC = multipath -Index: multipath-tools-080519/multipathd/Makefile +Index: multipath-tools/multipathd/Makefile =================================================================== ---- multipath-tools-080519.orig/multipathd/Makefile -+++ multipath-tools-080519/multipathd/Makefile -@@ -5,7 +5,7 @@ include ../Makefile.inc +--- 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 -laio -ldl \ ++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 $@ $^ + |