2b0cd7cceb
Rebased on top of Martin Wilck's queue of ACKed upstream commits * https://github.com/openSUSE/multipath-tools/tree/upstream-queue * All previous patches have been reordered, with the exception of 0011-libdmmp-Add-support-for-upcoming-json-c-0.14.0.patch which has been replaced with 0029-fix-boolean-value-with-json-c-0.14.patch Modify 0054-RH-add-mpathconf.patch * remove default enable_foreign and property blacklist_exceptions settings, and deal with the builtin default change from 0031-libmultipath-set-enable_foreign-to-NONE-by-default.patch. Fixes bz #1853668 Add 0048-Makefile.inc-trim-extra-information-from-systemd-ver.patch Add 0049-kpartx-fix-Wsign-compare-error.patch * The above two patches have been submitted upstream
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Mon, 11 May 2020 23:44:19 +0200
|
|
Subject: [PATCH] multipath tools tests/Makefile: Fix OBJDEPS for hwtable-test
|
|
|
|
OBJDEPS needs to list object files that _call_ functions we want
|
|
to wrap, but it should _not_ list the object files where these
|
|
functions are defined; otherwise the linker might resolve these
|
|
symbols before they can be wrapped.
|
|
|
|
(Observed on i586 with gcc 9.3.1, ld 2.34.0, where wrapping
|
|
prio_getprio() doesn't work with prio.o in OBJDEPS).
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
tests/Makefile | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/Makefile b/tests/Makefile
|
|
index 028c9ea7..1b8706a7 100644
|
|
--- a/tests/Makefile
|
|
+++ b/tests/Makefile
|
|
@@ -41,7 +41,7 @@ endif
|
|
dmevents-test_LIBDEPS = -lpthread -ldevmapper -lurcu
|
|
hwtable-test_TESTDEPS := test-lib.o
|
|
hwtable-test_OBJDEPS := ../libmultipath/discovery.o ../libmultipath/blacklist.o \
|
|
- ../libmultipath/prio.o ../libmultipath/callout.o ../libmultipath/structs.o
|
|
+ ../libmultipath/structs.o
|
|
hwtable-test_LIBDEPS := -ludev -lpthread -ldl
|
|
blacklist-test_TESTDEPS := test-log.o
|
|
blacklist-test_OBJDEPS := ../libmultipath/blacklist.o
|
|
--
|
|
2.17.2
|
|
|