e09eb3e2aa
Update to v4.2.0-rc3. Intent is to submit to Factory, and SLE-15-SP2 as well OBS-URL: https://build.opensuse.org/request/show/751303 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=513
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Fri, 3 Nov 2017 11:12:40 -0600
|
|
Subject: 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 b437a346d71a55d75f207f36e85b..52881cbb12e7d980e0ed51f21174 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -579,7 +579,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
|
|
|
|
scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(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 6099be1d848c7f52ea02694d6d86..09a33aecfd6ef543eeee8c5023b6 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -3836,7 +3836,7 @@ int main(void) {
|
|
return 0;
|
|
}
|
|
EOF
|
|
- if compile_prog "" "-ludev -lmultipath -lmpathpersist" ; then
|
|
+ if compile_prog "" "-ludev -lmpathpersist -lmultipath" ; then
|
|
mpathpersist=yes
|
|
mpathpersist_new_api=yes
|
|
else
|