Linker errors with external ELL

Commit Message

Adam Pigg July 21, 2024, 11:14 a.m. UTC

Hi Dennnis

Just to let you know, I have to patch Makefile.am when building with external 
ELL as a few of the unit tests fail to link due to missing l_basename.

I dont want to go through the full git-patch-review cycle for something so 
trivilal, happy for you just to fix it.  My diff looks like this

Thanks

Adam


 
@@ -903,7 +903,7 @@ unit_test_cell_info_dbus_SOURCES = unit/test-dbus.c \
 			src/dbus-clients.c src/dbus.c src/log.c
 unit_test_cell_info_dbus_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
 			@DBUS_GLIB_CFLAGS@
-unit_test_cell_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
+unit_test_cell_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl $
(ell_ldadd)
 unit_objects += $(unit_test_cell_info_dbus_OBJECTS)
 unit_tests += unit/test-cell-info-dbus
 
@@ -1010,7 +1010,7 @@ unit_test_dbus_clients_SOURCES = unit/test-dbus-
clients.c unit/test-dbus.c \
 				src/dbus-clients.c gdbus/object.c 
\
 				src/dbus.c src/log.c
 unit_test_dbus_clients_CFLAGS =  @DBUS_GLIB_CFLAGS@ $(COVERAGE_OPT) $
(AM_CFLAGS)
-unit_test_dbus_clients_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
+unit_test_dbus_clients_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl $(ell_ldadd)
 unit_objects += $(unit_test_dbus_clients_OBJECTS)
 unit_tests += unit/test-dbus-clients
 
@@ -1018,7 +1018,7 @@ unit_test_dbus_queue_SOURCES = unit/test-dbus-queue.c 
unit/test-dbus.c \
 				src/dbus-queue.c gdbus/object.c \
 				src/dbus.c src/log.c
 unit_test_dbus_queue_CFLAGS =  @DBUS_GLIB_CFLAGS@ $(COVERAGE_OPT) $
(AM_CFLAGS)
-unit_test_dbus_queue_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
+unit_test_dbus_queue_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl $(ell_ldadd)
 unit_objects += $(unit_test_dbus_queue_OBJECTS)
 unit_tests += unit/test-dbus-queue
 
@@ -1026,7 +1026,7 @@ if SAILFISH_ACCESS
 unit_test_sailfish_access_SOURCES = unit/test-sailfish_access.c \
 			plugins/sailfish_access.c src/dbus-access.c 
src/log.c
 unit_test_sailfish_access_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
-unit_test_sailfish_access_LDADD = @GLIB_LIBS@ -ldl
+unit_test_sailfish_access_LDADD = @GLIB_LIBS@ -ldl $(ell_ldadd)
 unit_objects += $(unit_test_sailfish_access_OBJECTS)
 unit_tests += unit/test-sailfish_access
 endif
@@ -1034,7 +1034,7 @@ endif
 unit_test_dbus_access_SOURCES = unit/test-dbus-access.c src/dbus-access.c \
 			src/log.c
 unit_test_dbus_access_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
-unit_test_dbus_access_LDADD = @GLIB_LIBS@ -ldl
+unit_test_dbus_access_LDADD = @GLIB_LIBS@ -ldl $(ell_ldadd)
 unit_objects += $(unit_test_dbus_access_OBJECTS)
 unit_tests += unit/test-dbus-access

Comments

Denis Kenzior July 22, 2024, 3:55 p.m. UTC | #1

Hi Adam,

On 7/21/24 6:14 AM, Adam Pigg wrote:
> Hi Dennnis
> 
> Just to let you know, I have to patch Makefile.am when building with external
> ELL as a few of the unit tests fail to link due to missing l_basename.

None of the unit tests listed in your Makefile.am patch are upstream.  I suspect 
they're present only in the Sailfish ofono fork you're using?

Regards,
-Denis

Adam Pigg July 22, 2024, 4:30 p.m. UTC | #2

Hi Dennis

Ah, ok, i (wrongly) assumed some of them (the dbus ones) were upstream, so 
this is a self inflicted issue!

Adam
On Monday 22 July 2024 16:55:23 BST Denis Kenzior wrote:
> Hi Adam,
> 
> On 7/21/24 6:14 AM, Adam Pigg wrote:
> > Hi Dennnis
> > 
> > Just to let you know, I have to patch Makefile.am when building with
> > external ELL as a few of the unit tests fail to link due to missing
> > l_basename.
> None of the unit tests listed in your Makefile.am patch are upstream.  I
> suspect they're present only in the Sailfish ofono fork you're using?
> 
> Regards,
> -Denis

Patch

diff --git a/Makefile.am b/Makefile.am
index 1876e489..090791d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -884,7 +884,7 @@  unit_objects += $(unit_test_common_OBJECTS)
 
 unit_test_cell_info_SOURCES = unit/test-cell-info.c src/cell-info.c src/log.c
 unit_test_cell_info_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
-unit_test_cell_info_LDADD = @GLIB_LIBS@ -ldl
+unit_test_cell_info_LDADD = @GLIB_LIBS@ -ldl $(ell_ldadd)
 unit_objects += $(unit_test_cell_info_OBJECTS)
 unit_tests += unit/test-cell-info
 
@@ -892,7 +892,7 @@  unit_test_cell_info_control_SOURCES = unit/test-cell-info-
control.c \
 			unit/fake_cell_info.c src/cell-info.c \
 			src/cell-info-control.c src/log.c
 unit_test_cell_info_control_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
-unit_test_cell_info_control_LDADD = @GLIB_LIBS@ -ldl
+unit_test_cell_info_control_LDADD = @GLIB_LIBS@ -ldl $(ell_ldadd)
 unit_objects += $(unit_test_cell_info_control_OBJECTS)
 unit_tests += unit/test-cell-info-control