Add missing shared-object link dependencies

Issue #4408
2025-02-20 17:52:52 +00:00 · 2022-02-09 13:48:42 +01:00 · 2022-02-09 13:48:42 +01:00 · ec559b85e2
commit ec559b85e2
parent 144cc8ac54
25 changed files with 31 additions and 43 deletions
--- a/repos/dde_linux/src/drivers/wifi/target.mk
+++ b/repos/dde_linux/src/drivers/wifi/target.mk
@ -4,6 +4,7 @@ TARGET   = wifi_drv
 SRC_CC   = main.cc wpa.cc
 LIBS     = base wifi iwl_firmware
 LIBS    += wpa_supplicant libc nic_driver
+LIBS    += libcrypto libssl wpa_driver_nl80211

 # needed for firmware.h
 INC_DIR += $(REP_DIR)/src/lib/wifi/include
--- a/repos/gems/lib/mk/vfs_pipe.mk
+++ b/repos/gems/lib/mk/vfs_pipe.mk
@ -1,5 +1,7 @@
 SRC_CC = plugin.cc

+LIBS = base
+
 vpath %.cc $(REP_DIR)/src/lib/vfs/pipe

 SHARED_LIB = yes
--- a/repos/gems/src/app/cbe_tester/target.mk
+++ b/repos/gems/src/app/cbe_tester/target.mk
@ -8,5 +8,6 @@ SRC_CC  += vfs_utilities.cc

 INC_DIR := $(PRG_DIR)
 LIBS    += base cbe_cxx cbe_init_cxx cbe_check_cxx cbe_dump_cxx vfs
+LIBS    += spark libsparkcrypto

 CC_CXX_WARN_STRICT_CONVERSION =
--- a/repos/gems/src/lib/vfs/pipe/target.mk
+++ b/repos/gems/src/lib/vfs/pipe/target.mk
@ -1,2 +1,2 @@
 TARGET = dummy-vfs_pipe
-LIBS   = vfs_pipe
+LIBS   = vfs_pipe base
--- a/repos/gems/src/server/tcp_terminal/target.mk
+++ b/repos/gems/src/server/tcp_terminal/target.mk
@ -1,5 +1,5 @@
 TARGET = tcp_terminal
 SRC_CC = main.cc
-LIBS   = libc
+LIBS   = libc base

 CC_CXX_WARN_STRICT =
--- a/repos/gems/src/server/terminal_mux/target.mk
+++ b/repos/gems/src/server/terminal_mux/target.mk
@ -1,6 +1,6 @@
 TARGET   = terminal_mux
 SRC_CC   = main.cc ncurses.cc
-LIBS     = libc ncurses
+LIBS     = libc ncurses base
 INC_DIR += $(PRG_DIR)

 CC_CXX_WARN_STRICT =
--- a/repos/gems/src/test/aes_cbc_4k/target.mk
+++ b/repos/gems/src/test/aes_cbc_4k/target.mk
@ -1,3 +1,3 @@
 TARGET := test-aes_cbc_4k
 SRC_CC := main.cc
-LIBS   += base aes_cbc_4k
+LIBS   += base aes_cbc_4k libcrypto
--- a/repos/gems/src/test/decorator_stress/target.mk
+++ b/repos/gems/src/test/decorator_stress/target.mk
@ -1,8 +1,7 @@
 TARGET = test-decorator_stress
 SRC_CC = main.cc
-LIBS   = libc libm
+LIBS   = libc libm base

 INC_DIR += $(PRG_DIR)

-
 CC_CXX_WARN_STRICT =
--- a/repos/libports/run/ieee754.run
+++ b/repos/libports/run/ieee754.run
@ -25,7 +25,7 @@ install_config {
 		<default caps="100"/>
 		<start name="test1">
 			<binary name="test-ieee754"/>
-			<resource name="RAM" quantum="2M"/>
+			<resource name="RAM" quantum="2096K"/>
 			<config>
 				<vfs> <dir name="dev"><log/></dir></vfs>
 				<libc stdout="/dev/log"/>
@ -33,7 +33,7 @@ install_config {
 		</start>
 		<start name="test2">
 			<binary name="test-ieee754"/>
-			<resource name="RAM" quantum="2M"/>
+			<resource name="RAM" quantum="2096K"/>
 			<config>
 				<vfs> <dir name="dev"><log/></dir></vfs>
 				<libc stdout="/dev/log"/>
@ -41,7 +41,7 @@ install_config {
 		</start>
 		<start name="test3">
 			<binary name="test-ieee754"/>
-			<resource name="RAM" quantum="2M"/>
+			<resource name="RAM" quantum="2096K"/>
 			<config>
 				<vfs> <dir name="dev"><log/></dir></vfs>
 				<libc stdout="/dev/log"/>
@ -49,7 +49,7 @@ install_config {
 		</start>
 		<start name="test4">
 			<binary name="test-ieee754"/>
-			<resource name="RAM" quantum="2M"/>
+			<resource name="RAM" quantum="2096K"/>
 			<config>
 				<vfs> <dir name="dev"><log/></dir></vfs>
 				<libc stdout="/dev/log"/>
@ -58,7 +58,7 @@ install_config {
 	</config>
 }

-build_boot_image "core ld.lib.so init test-ieee754 libc.lib.so libm.lib.so vfs.lib.so"
+build_boot_image "core ld.lib.so init test-ieee754 posix.lib.so libc.lib.so libm.lib.so vfs.lib.so"

 append qemu_args "-nographic "

--- a/repos/libports/src/test/fatfs_block_io/target.mk
+++ b/repos/libports/src/test/fatfs_block_io/target.mk
@ -1,9 +1,9 @@
 TARGET = test-fatfs_block_io
-LIBS = fatfs_block libc
-SRC_C = app4.c
+LIBS   = fatfs_block libc base
+SRC_C  = app4.c
 SRC_CC = component.cc

-CC_DEF += -D_MAX_SS=FF_MAX_SS
+CC_DEF  += -D_MAX_SS=FF_MAX_SS
 CC_WARN += -Wno-pointer-to-int-cast

 FATFS_PORT_DIR = $(call select_from_ports,fatfs)
--- a/repos/libports/src/test/ieee754/component.cc
+++ b/repos/libports/src/test/ieee754/component.cc
@ -1,15 +0,0 @@
-#include <base/heap.h>
-#include <libc/component.h>
-
-extern int main (int argc, char* argv[]);
-
-void Libc::Component::construct(Libc::Env &env)
-{
-	env.exec_static_constructors();
-
-	Genode::Heap heap(env.ram(), env.rm());
-
-	int r = 0;
-	Libc::with_libc([&r] () { r = main(0, 0); });
-	env.parent().exit(r);
-}
--- a/repos/libports/src/test/ieee754/target.mk
+++ b/repos/libports/src/test/ieee754/target.mk
@ -1,4 +1,3 @@
 TARGET = test-ieee754
-LIBS   = libc libm
+LIBS   = posix
 SRC_C  = tst-ieee754.c
-SRC_CC = component.cc
--- a/repos/libports/src/test/libc_integration/target.mk
+++ b/repos/libports/src/test/libc_integration/target.mk
@ -3,6 +3,7 @@ TARGET := test-libc_integration
 LIBS   += libc
 LIBS   += posix
 LIBS   += stdcxx
+LIBS   += base
 LIBS   += vfs
 LIBS   += vfs_pipe

--- a/repos/libports/src/test/libc_with_libc/target.mk
+++ b/repos/libports/src/test/libc_with_libc/target.mk
@ -1,5 +1,5 @@
 TARGET   = test-libc_with_libc
 SRC_CC   = main.cc
-LIBS     = libc
+LIBS     = libc base

 CC_CXX_WARN_STRICT =
--- a/repos/libports/src/test/lwip/http_clnt/target.mk
+++ b/repos/libports/src/test/lwip/http_clnt/target.mk
@ -1,5 +1,5 @@
 TARGET   = test-http_clnt
-LIBS     = libc
+LIBS     = libc base
 SRC_CC   = main.cc

 CC_CXX_WARN_STRICT =
--- a/repos/libports/src/test/lwip/http_srv/target.mk
+++ b/repos/libports/src/test/lwip/http_srv/target.mk
@ -1,5 +1,5 @@
 TARGET   = test-lwip_httpsrv
-LIBS     = libc
+LIBS     = libc base
 SRC_CC   = main.cc

 CC_CXX_WARN_STRICT =
--- a/repos/libports/src/test/lwip/udp/client/target.mk
+++ b/repos/libports/src/test/lwip/udp/client/target.mk
@ -1,5 +1,5 @@
 TARGET   = test-lwip-udp-client
-LIBS     = libc
+LIBS     = libc base
 SRC_CC   = main.cc

 CC_CXX_WARN_STRICT =
--- a/repos/libports/src/test/lwip/udp/server/target.mk
+++ b/repos/libports/src/test/lwip/udp/server/target.mk
@ -1,5 +1,5 @@
 TARGET   = test-lwip-udp-server
-LIBS     = libc
+LIBS     = libc base
 SRC_CC   = main.cc

 CC_CXX_WARN_STRICT =
--- a/repos/libports/src/test/memcpy/target.mk
+++ b/repos/libports/src/test/memcpy/target.mk
@ -1,5 +1,5 @@
 TARGET = test-memcpy
 SRC_CC = main.cc
-LIBS  += libc
+LIBS  += libc base

 CC_CXX_WARN_STRICT_CONVERSION =
--- a/repos/libports/src/test/mesa_demo/triangle_gl/target.mk
+++ b/repos/libports/src/test/mesa_demo/triangle_gl/target.mk
@ -1,5 +1,5 @@
 TARGET = triangle_gl
-LIBS   = libm libc egl mesa
+LIBS   = base libm libc egl mesa

 SRC_C  = eglut.c main.c
 SRC_CC = eglut_genode.cc
--- a/repos/libports/src/test/moon/target.mk
+++ b/repos/libports/src/test/moon/target.mk
@ -1,5 +1,5 @@
 TARGET = test-moon
-LIBS   = luacxx libc
+LIBS   = luacxx libc base
 SRC_CC = main.cc

 CC_CXX_WARN_STRICT =
--- a/repos/libports/src/test/smartcard/target.mk
+++ b/repos/libports/src/test/smartcard/target.mk
@ -1,5 +1,5 @@
 TARGET = test-smartcard
-LIBS   = pcsc-lite posix
+LIBS   = base pcsc-lite posix libusb ccid
 SRC_CC = main.cc

 vpath main.cc $(PRG_DIR)/..
--- a/repos/ports/src/app/gdb_monitor/target.mk
+++ b/repos/ports/src/app/gdb_monitor/target.mk
@ -13,7 +13,7 @@ INC_DIR += $(GDB_CONTRIB_DIR)/include \
           $(PRG_DIR)/gdbsupport \
           $(PRG_DIR)

-LIBS    =  stdcxx libc \
+LIBS    =  base stdcxx libc \
           gdbserver_platform gdbserver_libc_support

 # libiberty
--- a/repos/ports/src/virtualbox5/target.inc
+++ b/repos/ports/src/virtualbox5/target.inc
@ -22,7 +22,7 @@ LIBS  += virtualbox5-bios virtualbox5-recompiler virtualbox5-runtime \

 LIBS  += libiconv

-LIBS  += qemu-usb
+LIBS  += qemu-usb libyuv

 INC_DIR += $(call select_from_repositories,src/lib/libc)

--- a/repos/ports/src/virtualbox6/target.mk
+++ b/repos/ports/src/virtualbox6/target.mk
@ -17,7 +17,7 @@ SRC_CC += HostServices/common/message.cpp services/services.cc
 LIBS  += base
 LIBS  += stdcxx
 LIBS  += libiconv
-LIBS  += qemu-usb
+LIBS  += qemu-usb libyuv
 LIBS  += mesa

 CC_OPT_main = -Wno-multistatement-macros