1 From 0374eb585bc3e47e914c7f523f904923a447d2f7 Mon Sep 17 00:00:00 2001
2 From: Jackie Huang <jackie.huang@windriver.com>
3 Date: Sat, 27 Jun 2020 10:26:58 +0800
4 Subject: [PATCH] libsm_watchdog_nfs: add missing dependency on libsm_common.so
6 Add missing dependency on libsm_common.so in Makefile for libsm_watchdog_nfs
7 to avoid race condition issue:
9 | ../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/8.3.0/ld: cannot
11 | collect2: error: ld returned 1 exit status
12 | make: *** [libsm_watchdog_nfs.so.0] Error 1
14 Upstream-Status: Submitted [https://review.opendev.org/759787]
16 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
18 service-mgmt/sm-common/src/Makefile | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
21 diff --git a/service-mgmt/sm-common/src/Makefile b/service-mgmt/sm-common/src/Makefile
22 index 7d138f9..487dfa0 100644
23 --- a/service-mgmt/sm-common/src/Makefile
24 +++ b/service-mgmt/sm-common/src/Makefile
25 @@ -53,7 +53,7 @@ libsm_watchdog_nfs.so: libsm_watchdog_nfs.so.$(VER_MJR)
26 libsm_watchdog_nfs.so.$(VER_MJR): libsm_watchdog_nfs.so.$(VER)
29 -libsm_watchdog_nfs.so.$(VER): libsm_common.so.$(VER)
30 +libsm_watchdog_nfs.so.$(VER): libsm_common.so.$(VER) libsm_common.so
31 $(CXX) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) sm_watchdog_nfs.c ${LDFLAGS} $(LDLIBS) -L./ -lsm_common -Wl,-soname,libsm_watchdog_nfs.so.$(VER_MJR) -o $@
33 sm_watchdog: libsm_common.so