On Fri, Jan 21, 2022 at 09:05:18PM +0000, David Carlier wrote:
> From e3f520ebd4f23fe42a1068ee2d9b42fd529241e8 Mon Sep 17 00:00:00 2001
> From: David Carlier <[email protected]>
> Date: Fri, 21 Jan 2022 20:57:27 +0000
> Subject: [PATCH 3/3] MEDIUM: deviceatlas doc and build update.
"MEDIUM: da: doc and build for new runtime update service" ?
> diff --git a/Makefile b/Makefile
> index af0f5cc87..e6f2e04ad 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -653,11 +653,14 @@ endif
> ifneq ($(USE_PCRE2),)
> OPTIONS_CFLAGS += -DDA_REGEX_HDR=\"dac_pcre2.c\" -DDA_REGEX_TAG=2
> endif
> +OPTIONS_OBJS += $(DEVICEATLAS_LIB)/Os/daunix.o
> +OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dadwcom.o
> +OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dasch.o
> OPTIONS_OBJS += $(DEVICEATLAS_LIB)/json.o
> OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dac.o
> endif
> OPTIONS_OBJS += addons/deviceatlas/da.o
> -OPTIONS_CFLAGS += $(if $(DEVICEATLAS_INC),-I$(DEVICEATLAS_INC))
> +OPTIONS_CFLAGS += $(if $(DEVICEATLAS_INC),-I$(DEVICEATLAS_INC))
^
Unneeded change that only inserted an accidental space.
> --- a/doc/DeviceAtlas-device-detection.txt
> +++ b/doc/DeviceAtlas-device-detection.txt
> @@ -9,7 +9,8 @@ The build supports the USE_PCRE and USE_PCRE2 options. Once
> extracted :
>
> Optionally DEVICEATLAS_INC and DEVICEATLAS_LIB may be set to override the
> path
> to the include files and libraries respectively if they're not in the source
> -directory.
> +directory. However, if the API had been installed beforehand, DEVICEATLAS_SRC
> +can be omitted. Note that the DeviceAtlas C API version supported is the
> 2.4.0 at minimum.
Please trim your text lines a bit, the rest of the file is justified to 80 chars
except for copy-pastable commands. The one above and a few below become really
hard to read in a terminal while previously that file managed to remain pretty
clean. There are a few other such lines that got extended further in the patch.
However now when trying to build I'm getting this new error:
make: *** No rule to make target 'addons/deviceatlas/dummy/Os/daunix.o',
needed by 'haproxy'. Stop.
Similarly I think you're missing an update to the dummy lib so that it's
transparent for build test and basic testing (i.e. I don't think you need to
implement anything looking like a real update, you can claim it happens every
few calls for example or even never, whatever suits you best).
Thank you!
Willy
