Add missing shared-object link dependencies

Issue #4408
This commit is contained in:
Norman Feske
2022-02-09 13:48:42 +01:00
parent 144cc8ac54
commit ec559b85e2
25 changed files with 31 additions and 43 deletions

View File

@ -4,6 +4,7 @@ TARGET = wifi_drv
SRC_CC = main.cc wpa.cc SRC_CC = main.cc wpa.cc
LIBS = base wifi iwl_firmware LIBS = base wifi iwl_firmware
LIBS += wpa_supplicant libc nic_driver LIBS += wpa_supplicant libc nic_driver
LIBS += libcrypto libssl wpa_driver_nl80211
# needed for firmware.h # needed for firmware.h
INC_DIR += $(REP_DIR)/src/lib/wifi/include INC_DIR += $(REP_DIR)/src/lib/wifi/include

View File

@ -1,5 +1,7 @@
SRC_CC = plugin.cc SRC_CC = plugin.cc
LIBS = base
vpath %.cc $(REP_DIR)/src/lib/vfs/pipe vpath %.cc $(REP_DIR)/src/lib/vfs/pipe
SHARED_LIB = yes SHARED_LIB = yes

View File

@ -8,5 +8,6 @@ SRC_CC += vfs_utilities.cc
INC_DIR := $(PRG_DIR) INC_DIR := $(PRG_DIR)
LIBS += base cbe_cxx cbe_init_cxx cbe_check_cxx cbe_dump_cxx vfs LIBS += base cbe_cxx cbe_init_cxx cbe_check_cxx cbe_dump_cxx vfs
LIBS += spark libsparkcrypto
CC_CXX_WARN_STRICT_CONVERSION = CC_CXX_WARN_STRICT_CONVERSION =

View File

@ -1,2 +1,2 @@
TARGET = dummy-vfs_pipe TARGET = dummy-vfs_pipe
LIBS = vfs_pipe LIBS = vfs_pipe base

View File

@ -1,5 +1,5 @@
TARGET = tcp_terminal TARGET = tcp_terminal
SRC_CC = main.cc SRC_CC = main.cc
LIBS = libc LIBS = libc base
CC_CXX_WARN_STRICT = CC_CXX_WARN_STRICT =

View File

@ -1,6 +1,6 @@
TARGET = terminal_mux TARGET = terminal_mux
SRC_CC = main.cc ncurses.cc SRC_CC = main.cc ncurses.cc
LIBS = libc ncurses LIBS = libc ncurses base
INC_DIR += $(PRG_DIR) INC_DIR += $(PRG_DIR)
CC_CXX_WARN_STRICT = CC_CXX_WARN_STRICT =

View File

@ -1,3 +1,3 @@
TARGET := test-aes_cbc_4k TARGET := test-aes_cbc_4k
SRC_CC := main.cc SRC_CC := main.cc
LIBS += base aes_cbc_4k LIBS += base aes_cbc_4k libcrypto

View File

@ -1,8 +1,7 @@
TARGET = test-decorator_stress TARGET = test-decorator_stress
SRC_CC = main.cc SRC_CC = main.cc
LIBS = libc libm LIBS = libc libm base
INC_DIR += $(PRG_DIR) INC_DIR += $(PRG_DIR)
CC_CXX_WARN_STRICT = CC_CXX_WARN_STRICT =

View File

@ -25,7 +25,7 @@ install_config {
<default caps="100"/> <default caps="100"/>
<start name="test1"> <start name="test1">
<binary name="test-ieee754"/> <binary name="test-ieee754"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2096K"/>
<config> <config>
<vfs> <dir name="dev"><log/></dir></vfs> <vfs> <dir name="dev"><log/></dir></vfs>
<libc stdout="/dev/log"/> <libc stdout="/dev/log"/>
@ -33,7 +33,7 @@ install_config {
</start> </start>
<start name="test2"> <start name="test2">
<binary name="test-ieee754"/> <binary name="test-ieee754"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2096K"/>
<config> <config>
<vfs> <dir name="dev"><log/></dir></vfs> <vfs> <dir name="dev"><log/></dir></vfs>
<libc stdout="/dev/log"/> <libc stdout="/dev/log"/>
@ -41,7 +41,7 @@ install_config {
</start> </start>
<start name="test3"> <start name="test3">
<binary name="test-ieee754"/> <binary name="test-ieee754"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2096K"/>
<config> <config>
<vfs> <dir name="dev"><log/></dir></vfs> <vfs> <dir name="dev"><log/></dir></vfs>
<libc stdout="/dev/log"/> <libc stdout="/dev/log"/>
@ -49,7 +49,7 @@ install_config {
</start> </start>
<start name="test4"> <start name="test4">
<binary name="test-ieee754"/> <binary name="test-ieee754"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2096K"/>
<config> <config>
<vfs> <dir name="dev"><log/></dir></vfs> <vfs> <dir name="dev"><log/></dir></vfs>
<libc stdout="/dev/log"/> <libc stdout="/dev/log"/>
@ -58,7 +58,7 @@ install_config {
</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 " append qemu_args "-nographic "

View File

@ -1,9 +1,9 @@
TARGET = test-fatfs_block_io TARGET = test-fatfs_block_io
LIBS = fatfs_block libc LIBS = fatfs_block libc base
SRC_C = app4.c SRC_C = app4.c
SRC_CC = component.cc 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 CC_WARN += -Wno-pointer-to-int-cast
FATFS_PORT_DIR = $(call select_from_ports,fatfs) FATFS_PORT_DIR = $(call select_from_ports,fatfs)

View File

@ -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);
}

View File

@ -1,4 +1,3 @@
TARGET = test-ieee754 TARGET = test-ieee754
LIBS = libc libm LIBS = posix
SRC_C = tst-ieee754.c SRC_C = tst-ieee754.c
SRC_CC = component.cc

View File

@ -3,6 +3,7 @@ TARGET := test-libc_integration
LIBS += libc LIBS += libc
LIBS += posix LIBS += posix
LIBS += stdcxx LIBS += stdcxx
LIBS += base
LIBS += vfs LIBS += vfs
LIBS += vfs_pipe LIBS += vfs_pipe

View File

@ -1,5 +1,5 @@
TARGET = test-libc_with_libc TARGET = test-libc_with_libc
SRC_CC = main.cc SRC_CC = main.cc
LIBS = libc LIBS = libc base
CC_CXX_WARN_STRICT = CC_CXX_WARN_STRICT =

View File

@ -1,5 +1,5 @@
TARGET = test-http_clnt TARGET = test-http_clnt
LIBS = libc LIBS = libc base
SRC_CC = main.cc SRC_CC = main.cc
CC_CXX_WARN_STRICT = CC_CXX_WARN_STRICT =

View File

@ -1,5 +1,5 @@
TARGET = test-lwip_httpsrv TARGET = test-lwip_httpsrv
LIBS = libc LIBS = libc base
SRC_CC = main.cc SRC_CC = main.cc
CC_CXX_WARN_STRICT = CC_CXX_WARN_STRICT =

View File

@ -1,5 +1,5 @@
TARGET = test-lwip-udp-client TARGET = test-lwip-udp-client
LIBS = libc LIBS = libc base
SRC_CC = main.cc SRC_CC = main.cc
CC_CXX_WARN_STRICT = CC_CXX_WARN_STRICT =

View File

@ -1,5 +1,5 @@
TARGET = test-lwip-udp-server TARGET = test-lwip-udp-server
LIBS = libc LIBS = libc base
SRC_CC = main.cc SRC_CC = main.cc
CC_CXX_WARN_STRICT = CC_CXX_WARN_STRICT =

View File

@ -1,5 +1,5 @@
TARGET = test-memcpy TARGET = test-memcpy
SRC_CC = main.cc SRC_CC = main.cc
LIBS += libc LIBS += libc base
CC_CXX_WARN_STRICT_CONVERSION = CC_CXX_WARN_STRICT_CONVERSION =

View File

@ -1,5 +1,5 @@
TARGET = triangle_gl TARGET = triangle_gl
LIBS = libm libc egl mesa LIBS = base libm libc egl mesa
SRC_C = eglut.c main.c SRC_C = eglut.c main.c
SRC_CC = eglut_genode.cc SRC_CC = eglut_genode.cc

View File

@ -1,5 +1,5 @@
TARGET = test-moon TARGET = test-moon
LIBS = luacxx libc LIBS = luacxx libc base
SRC_CC = main.cc SRC_CC = main.cc
CC_CXX_WARN_STRICT = CC_CXX_WARN_STRICT =

View File

@ -1,5 +1,5 @@
TARGET = test-smartcard TARGET = test-smartcard
LIBS = pcsc-lite posix LIBS = base pcsc-lite posix libusb ccid
SRC_CC = main.cc SRC_CC = main.cc
vpath main.cc $(PRG_DIR)/.. vpath main.cc $(PRG_DIR)/..

View File

@ -13,7 +13,7 @@ INC_DIR += $(GDB_CONTRIB_DIR)/include \
$(PRG_DIR)/gdbsupport \ $(PRG_DIR)/gdbsupport \
$(PRG_DIR) $(PRG_DIR)
LIBS = stdcxx libc \ LIBS = base stdcxx libc \
gdbserver_platform gdbserver_libc_support gdbserver_platform gdbserver_libc_support
# libiberty # libiberty

View File

@ -22,7 +22,7 @@ LIBS += virtualbox5-bios virtualbox5-recompiler virtualbox5-runtime \
LIBS += libiconv LIBS += libiconv
LIBS += qemu-usb LIBS += qemu-usb libyuv
INC_DIR += $(call select_from_repositories,src/lib/libc) INC_DIR += $(call select_from_repositories,src/lib/libc)

View File

@ -17,7 +17,7 @@ SRC_CC += HostServices/common/message.cpp services/services.cc
LIBS += base LIBS += base
LIBS += stdcxx LIBS += stdcxx
LIBS += libiconv LIBS += libiconv
LIBS += qemu-usb LIBS += qemu-usb libyuv
LIBS += mesa LIBS += mesa
CC_OPT_main = -Wno-multistatement-macros CC_OPT_main = -Wno-multistatement-macros