38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
|
From dc5a5c0f142eb0176824a440de94b77544ce2fdc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bruce Rogers <brogers@suse.com>
|
||
|
|
Date: Fri, 3 Nov 2017 11:12:40 -0600
|
||
|
|
Subject: [PATCH] Switch order of libraries for mpath support
|
||
|
|
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
Makefile | 2 +-
|
||
|
|
configure | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index ab0354c153..4be3366e27 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -449,7 +449,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
|
||
|
|
|
||
|
|
scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
|
||
|
|
ifdef CONFIG_MPATH
|
||
|
|
-scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist
|
||
|
|
+scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmpathpersist -lmultipath
|
||
|
|
endif
|
||
|
|
|
||
|
|
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
|
||
|
|
diff --git a/configure b/configure
|
||
|
|
index 0c6e7572db..01e1d15fa4 100755
|
||
|
|
--- a/configure
|
||
|
|
+++ b/configure
|
||
|
|
@@ -3382,7 +3382,7 @@ int main(void) {
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
EOF
|
||
|
|
- if compile_prog "" "-ludev -lmultipath -lmpathpersist" ; then
|
||
|
|
+ if compile_prog "" "-ludev -lmpathpersist -lmultipath" ; then
|
||
|
|
mpathpersist=yes
|
||
|
|
else
|
||
|
|
mpathpersist=no
|