Hi, Following-up on a recent user support and realising some parts are more complex than it needs to be here a set of patches to address it, the build aspect first. Ideally, to be backported down to the lowest stable branch.
From 053dfe6c30cfc06a836f59d6eebf49a7cead0a9d Mon Sep 17 00:00:00 2001 From: David Carlier <dcarl...@deviceatlas.com> Date: Wed, 2 Jul 2025 14:00:07 +0100 Subject: [PATCH 1/2] BUILD/MEDIUM: deviceatlas: fix when installed in custom locations.
We are reusing DEVICEATLAS_INC/DEVICEATLAS_LIB when the DeviceAtlas library had been compiled and installed with cmake and make install targets. Works fine except when ldconfig is unaware of the path, thus adding cflags/ldflags into the mix. --- addons/deviceatlas/Makefile.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/deviceatlas/Makefile.inc b/addons/deviceatlas/Makefile.inc index 07d950a14..b144f883b 100644 --- a/addons/deviceatlas/Makefile.inc +++ b/addons/deviceatlas/Makefile.inc @@ -5,7 +5,8 @@ CXX := c++ CXXLIB := -lstdc++ ifeq ($(DEVICEATLAS_SRC),) -OPTIONS_LDFLAGS += -lda +OPTIONS_CFLAGS += -I$(DEVICEATLAS_INC) +OPTIONS_LDFLAGS += -Wl,-rpath,$(DEVICEATLAS_LIB) -L$(DEVICEATLAS_LIB) -lda else DEVICEATLAS_INC = $(DEVICEATLAS_SRC) DEVICEATLAS_LIB = $(DEVICEATLAS_SRC) -- 2.50.0
