2018-08-03 18:05:13 +02:00
|
|
|
From fd50e2e8a90887300e49d50863bff64a116f93b8 Mon Sep 17 00:00:00 2001
|
2017-12-14 01:53:24 +01:00
|
|
|
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
|
2018-05-01 17:20:58 +02:00
|
|
|
index d71dd5bea4..3c5368382c 100644
|
2017-12-14 01:53:24 +01:00
|
|
|
--- a/Makefile
|
|
|
|
|
+++ b/Makefile
|
2018-05-01 17:20:58 +02:00
|
|
|
@@ -544,7 +544,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
|
2017-12-14 01:53:24 +01:00
|
|
|
|
|
|
|
|
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
|
2018-08-03 18:05:13 +02:00
|
|
|
index 457684a7e6..96edba0aed 100755
|
2017-12-14 01:53:24 +01:00
|
|
|
--- a/configure
|
|
|
|
|
+++ b/configure
|
2018-08-03 18:05:13 +02:00
|
|
|
@@ -3488,7 +3488,7 @@ int main(void) {
|
2017-12-14 01:53:24 +01:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
EOF
|
|
|
|
|
- if compile_prog "" "-ludev -lmultipath -lmpathpersist" ; then
|
|
|
|
|
+ if compile_prog "" "-ludev -lmpathpersist -lmultipath" ; then
|
|
|
|
|
mpathpersist=yes
|
|
|
|
|
else
|
|
|
|
|
mpathpersist=no
|
