swupdate: fix non-parallel build
Building swupdate with '-j1' fails with: swupdate$ make -j1 scripts/kconfig/conf --silentoldconfig Kconfig CC ipc/network_ipc.o CC ipc/network_ipc-if.o CC ipc/progress_ipc.o LD ipc/built-in.o LD libswupdate.so.0.1 Failed: aarch64-dey-linux/11.3.0/ld: cannot find ipc-static/lib.a: No such file or directory collect2: error: ld returned 1 exit status That's due to trying to link a static library that has not been compiled yet. That dependence seems spurious and we added it in a patch, so remove it to fix non-parallel builds. https://onedigi.atlassian.net/browse/DEL-8445 Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
parent
c6f19a099c
commit
e2bbc06fea
|
|
@ -5,19 +5,19 @@ Subject: [PATCH] Makefile: change Makefile to build swupdate library
|
|||
|
||||
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
|
||||
---
|
||||
Makefile | 4 +++-
|
||||
Makefile | 2 ++
|
||||
ipc-static/Makefile | 6 ++++++
|
||||
ipc-static/network_ipc-if.c | 1 +
|
||||
ipc-static/network_ipc.c | 1 +
|
||||
ipc-static/progress_ipc.c | 1 +
|
||||
5 files changed, 12 insertions(+), 1 deletion(-)
|
||||
5 files changed, 11 insertions(+)
|
||||
create mode 100644 ipc-static/Makefile
|
||||
create mode 120000 ipc-static/network_ipc-if.c
|
||||
create mode 120000 ipc-static/network_ipc.c
|
||||
create mode 120000 ipc-static/progress_ipc.c
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 09d03a3..080b834 100644
|
||||
index 09d03a3..f34810b 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -364,6 +364,7 @@ include $(srctree)/Makefile.flags
|
||||
|
|
@ -28,15 +28,6 @@ index 09d03a3..080b834 100644
|
|||
bindings-y := bindings
|
||||
tools-y := tools
|
||||
|
||||
@@ -437,7 +438,7 @@ quiet_cmd_shared = LD $@
|
||||
"-shared -Wl,-soname,$@" \
|
||||
"$(KBUILD_CFLAGS) $(CFLAGS_swupdate)" \
|
||||
"$(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_swupdate) -L$(objtree)" \
|
||||
- "$(2)" \
|
||||
+ "$(2) ipc-static/lib.a" \
|
||||
"" \
|
||||
"$(LDLIBS)"
|
||||
|
||||
@@ -480,6 +481,7 @@ install: all
|
||||
install -m 0644 $(srctree)/include/progress_ipc.h ${DESTDIR}/${INCLUDEDIR}
|
||||
install -m 0755 $(objtree)/${swupdate-ipc-lib} ${DESTDIR}/${LIBDIR}
|
||||
|
|
|
|||
Loading…
Reference in New Issue