Fix linker complains about missing libraries

After an upgrade, I got errors like this:
  /usr/bin/ld: fwp-timing.o: undefined reference to symbol 'clock_nanosleep@@GLIBC_2.2.5'
  /usr/bin/ld: note: 'clock_nanosleep@@GLIBC_2.2.5' is defined in DSO /lib64/librt.so.1 so try adding it to the linker command line
  /lib64/librt.so.1: could not read symbols: Invalid operation

It was sufficient to fix them by adding mentioned libraries explicitely in
Makefile.omk.

diff --git a/src/forb/src/forbrun/Makefile.omk b/src/forb/src/forbrun/Makefile.omk
index a2bde3c852eb0b7d83c501eb93e09d6af28ca66b..8df881f80e1c2033adb1f95f37183ba26229a52c 100644 (file)
--- a/src/forb/src/forbrun/Makefile.omk
+++ b/src/forb/src/forbrun/Makefile.omk
@@ -3,4 +3,4 @@ SUBDIRS = tests
 bin_PROGRAMS = forbrun
 forbrun_SOURCES = forbrun.c
 
-lib_LOADLIBES = forb ulut fosa rt dl
+lib_LOADLIBES = forb ulut fosa rt dl pthread

diff --git a/src/forb/src/tests/Makefile.omk b/src/forb/src/tests/Makefile.omk
index 1979427921a2942859098dc8d334a695df1dc4d4..021ea66a79c332f8a5b82d3ab6fce3bccf40655b 100644 (file)
--- a/src/forb/src/tests/Makefile.omk
+++ b/src/forb/src/tests/Makefile.omk
@@ -15,7 +15,7 @@ sequence_LIBS = wvtest
 CFLAGS += -DTEST -DWVTEST_CONFIGURED
 INCLUDES += -I.
 
-lib_LOADLIBES = forb ulut fosa rt
+lib_LOADLIBES = forb ulut fosa rt pthread
 
 hello_inproc_SOURCES = hello_inproc.c hello_impl.c
 hello_inproc_CLIENT_IDL = hello.idl

diff --git a/src/frsh/demo/video/Makefile.omk b/src/frsh/demo/video/Makefile.omk
index 24c7ba717be82b7c2e0a32078783645ba2b8e48a..f80a6789f206c0bfb2b1db6960f4ecff0cca29cc 100644 (file)
--- a/src/frsh/demo/video/Makefile.omk
+++ b/src/frsh/demo/video/Makefile.omk
@@ -1,4 +1,4 @@
-FRSH_LIBS = frsh
+FRSH_LIBS = frsh fosa
 lib_LOADLIBES+= m pthread rt $(FRSH_LIBS)
 
 bin_PROGRAMS = fplayer

diff --git a/src/frsh/frsh_api/tests/Makefile.omk b/src/frsh/frsh_api/tests/Makefile.omk
index 833f73b5ecc0d4a43601c05f12c20bac2e382357..130cca50905589928d69c7bf6f45be46033031d9 100644 (file)
--- a/src/frsh/frsh_api/tests/Makefile.omk
+++ b/src/frsh/frsh_api/tests/Makefile.omk
@@ -32,10 +32,10 @@ dummy_spare_capacity_LIBS = wvtest
 wvtest_SCRIPTS += trans_nego.sh
 test_PROGRAMS += trans_nego
 trans_nego_SOURCES = trans_nego.c
-trans_nego_LIBS = wvtest
+trans_nego_LIBS = wvtest fra_dummy
 test_PROGRAMS += trans_nego2
 trans_nego2_SOURCES = trans_nego2.c
-trans_nego2_LIBS = wvtest
+trans_nego2_LIBS = wvtest fra_dummy
 
 test_PROGRAMS += negobench
 negobench_SOURCES = negobench.c
@@ -46,7 +46,7 @@ renegobench_SOURCES = renegobench.c
 test_PROGRAMS += scbench
 scbench_SOURCES = scbench.c
 
-lib_LOADLIBES += pthread rt frsh 
+lib_LOADLIBES += pthread rt frsh contract
 
 ifeq ($(CONFIG_FWP),y)
 SUBDIRS= fwptest pingpong

diff --git a/src/frsh/resources/acpi_battery/tests/Makefile.omk b/src/frsh/resources/acpi_battery/tests/Makefile.omk
index 0e006b02326bb5af2ccd6d6092a186746354cf08..46767fa6d5a6bc970593b62b28a66aedcc738998 100644 (file)
--- a/src/frsh/resources/acpi_battery/tests/Makefile.omk
+++ b/src/frsh/resources/acpi_battery/tests/Makefile.omk
@@ -1,3 +1,3 @@
 test_PROGRAMS = acpi_battery_test
 acpi_battery_test_SOURCES = acpi_battery_test.c
-lib_LOADLIBES += pthread rt frsh
+lib_LOADLIBES += pthread rt frsh fosa

diff --git a/src/frsh/resources/item/tests/Makefile.omk b/src/frsh/resources/item/tests/Makefile.omk
index 853ad6b576a1a73c66ac73ab0e94f87e78cd8cf5..6f37d23a4475585976130190a8cde92f1ae25112 100644 (file)
--- a/src/frsh/resources/item/tests/Makefile.omk
+++ b/src/frsh/resources/item/tests/Makefile.omk
@@ -1,3 +1,3 @@
 test_PROGRAMS += test_item
 test_item_SOURCES = test_item.c
-lib_LOADLIBES += pthread rt frsh 
+lib_LOADLIBES += pthread rt frsh contract fra_item

diff --git a/src/fwp/fwp/mngr/Makefile.omk b/src/fwp/fwp/mngr/Makefile.omk
index 3b0f6b3bf10ccade73ac4026d2ab152423bf8f8d..11e40a4774d576341ce3ce195e86a89579063056 100644 (file)
--- a/src/fwp/fwp/mngr/Makefile.omk
+++ b/src/fwp/fwp/mngr/Makefile.omk
@@ -1,6 +1,6 @@
 bin_PROGRAMS = frm_fwp
 frm_fwp_SOURCES = fwp_mngr.c fwp_admctrl.c
-frm_fwp_LIBS = frm forb contract fosa rt ulut fcb_client
+frm_fwp_LIBS = frm forb contract fosa rt ulut fcb_client frsh_fwp
 
 include_HEADERS = wifi_agent.h
 CFLAGS += -D_FWP_INTERNALS_

diff --git a/src/fwp/fwp/tests/timing/Makefile.omk b/src/fwp/fwp/tests/timing/Makefile.omk
index 57aac08f5f4d32035492c0493e9aada551a165cd..516090e749b4a68db497508358ab73882a709b68 100644 (file)
--- a/src/fwp/fwp/tests/timing/Makefile.omk
+++ b/src/fwp/fwp/tests/timing/Makefile.omk
@@ -1,3 +1,3 @@
 test_PROGRAMS = fwp-timing
 fwp-timing_SOURCES = fwp-timing.c
-lib_LOADLIBES = frsh
+lib_LOADLIBES = frsh contract pthread rt

diff --git a/src/fwp/wme_test/Makefile.omk b/src/fwp/wme_test/Makefile.omk
index 43ac0a54f8412a38a94ab53ea24f4110dff7621e..77c39a1610120c5ae85ef2c9367bc08779e7f109 100644 (file)
--- a/src/fwp/wme_test/Makefile.omk
+++ b/src/fwp/wme_test/Makefile.omk
@@ -1,7 +1,7 @@
 bin_PROGRAMS = fwptester fwptesterserver
 
 CFLAGS += -D_REENTRANT -g -DWITH_FWP
-lib_LOADLIBES = pthread  rt frsh ulut ncurses
+lib_LOADLIBES = pthread  rt frsh ulut ncurses contract
 
 fwptester_SOURCES = wclient.c common.c
 fwptesterserver_SOURCES = wserver.c common.c