rpms/device-mapper-multipath
7
0
Fork 0
Code Issues Pull Requests Releases Activity
b3b10f9bcf
device-mapper-multipath/linking_change.patch

69 lines
2.1 KiB
Diff
Raw Normal View History

Since libaio is now in /lib, not /usr/lib, multipath no longer needs to 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
2008-09-26 23:28:36 +00:00
Index: multipath-tools/libmultipath/Makefile
Updated to latest Upstream 0.4.8 code: multipath-tools-080519.tgz (git commit id: 42704728855376d2f7da2de1967d7bc71bc54a2f)
2008-05-20 04:37:41 +00:00
===================================================================
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to 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
2008-09-26 23:28:36 +00:00
--- multipath-tools.orig/libmultipath/Makefile
+++ multipath-tools/libmultipath/Makefile
Fixed Makefile issues.
2008-05-20 06:30:55 +00:00
@@ -23,14 +23,15 @@ endif
Updated to latest Upstream 0.4.8 code: multipath-tools-080519.tgz (git commit id: 42704728855376d2f7da2de1967d7bc71bc54a2f)
2008-05-20 04:37:41 +00:00
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
Fixed ownership build error.
2008-05-20 05:27:05 +00:00
+ $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(prefix)/lib/$(LIBS)
$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
- $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)/$(LIBS)
Updated to latest Upstream 0.4.8 code: multipath-tools-080519.tgz (git commit id: 42704728855376d2f7da2de1967d7bc71bc54a2f)
2008-05-20 04:37:41 +00:00
uninstall:
- rm -f $(DESTDIR)$(libdir)/$(LIBS)
+ rm -f $(DESTDIR)$(prefix)/lib/$(LIBS)
clean:
rm -f core *.a *.o *.gz *.so
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to 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
2008-09-26 23:28:36 +00:00
Index: multipath-tools/multipath/Makefile
Updated to latest Upstream 0.4.8 code: multipath-tools-080519.tgz (git commit id: 42704728855376d2f7da2de1967d7bc71bc54a2f)
2008-05-20 04:37:41 +00:00
===================================================================
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to 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
2008-09-26 23:28:36 +00:00
--- multipath-tools.orig/multipath/Makefile
+++ multipath-tools/multipath/Makefile
@@ -6,9 +6,8 @@ include ../Makefile.inc
Updated to latest Upstream 0.4.8 code: multipath-tools-080519.tgz (git commit id: 42704728855376d2f7da2de1967d7bc71bc54a2f)
2008-05-20 04:37:41 +00:00
OBJS = main.o
-CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir)
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to 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
2008-09-26 23:28:36 +00:00
-LDFLAGS += -lpthread -ldevmapper -laio -ldl \
- -lmultipath -L$(multipathdir)
Updated to latest Upstream 0.4.8 code: multipath-tools-080519.tgz (git commit id: 42704728855376d2f7da2de1967d7bc71bc54a2f)
2008-05-20 04:37:41 +00:00
+CFLAGS += -I$(multipathdir)
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to 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
2008-09-26 23:28:36 +00:00
+LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
EXEC = multipath
Updated to latest Upstream 0.4.8 code: multipath-tools-080519.tgz (git commit id: 42704728855376d2f7da2de1967d7bc71bc54a2f)
2008-05-20 04:37:41 +00:00
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to 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
2008-09-26 23:28:36 +00:00
Index: multipath-tools/multipathd/Makefile
Updated to latest Upstream 0.4.8 code: multipath-tools-080519.tgz (git commit id: 42704728855376d2f7da2de1967d7bc71bc54a2f)
2008-05-20 04:37:41 +00:00
===================================================================
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to 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
2008-09-26 23:28:36 +00:00
--- multipath-tools.orig/multipathd/Makefile
+++ multipath-tools/multipathd/Makefile
@@ -5,8 +5,8 @@ include ../Makefile.inc
Updated to latest Upstream 0.4.8 code: multipath-tools-080519.tgz (git commit id: 42704728855376d2f7da2de1967d7bc71bc54a2f)
2008-05-20 04:37:41 +00:00
#
# basic flags setting
#
-CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir)
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to 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
2008-09-26 23:28:36 +00:00
-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -laio -ldl \
Updated to latest Upstream 0.4.8 code: multipath-tools-080519.tgz (git commit id: 42704728855376d2f7da2de1967d7bc71bc54a2f)
2008-05-20 04:37:41 +00:00
+CFLAGS += -I$(multipathdir)
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to 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
2008-09-26 23:28:36 +00:00
+LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
Updated to latest Upstream 0.4.8 code: multipath-tools-080519.tgz (git commit id: 42704728855376d2f7da2de1967d7bc71bc54a2f)
2008-05-20 04:37:41 +00:00
-lmultipath -L$(multipathdir)
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to 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
2008-09-26 23:28:36 +00:00
#
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 $@ $^
Reference in New Issue Copy Permalink