git: ea1541625221 - main - www/unit: fix build failure when its run without OTEL
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 21 Dec 2024 21:24:11 UTC
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea15416252218fda847ff7f485c7ff4a6163861f commit ea15416252218fda847ff7f485c7ff4a6163861f Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2024-12-21 21:23:02 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2024-12-21 21:23:02 +0000 www/unit: fix build failure when its run without OTEL Reported by: Geraint Edwards <gedge@yadn.org> --- www/unit/Makefile | 5 +++-- www/unit/files/{patch-auto-make => extra-patch-auto-make} | 0 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/www/unit/Makefile b/www/unit/Makefile index e08e03683cd9..c39d034d977e 100644 --- a/www/unit/Makefile +++ b/www/unit/Makefile @@ -111,6 +111,7 @@ CARGO_INSTALL= no CARGO_TARGET_DIR= ${WRKSRC2}/target CARGO_VENDOR_DIR= ${WRKSRC2}/cargo-crates CONFIGURE_ARGS+= --otel +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-auto-make .include "${.CURDIR}/Makefile.cargo" .endif @@ -126,7 +127,7 @@ CFLAGS+= -Wno-compound-token-split-by-macro .endif .if !defined(UNIT_MODNAME) -post-configure: +post-configure-OTEL-on: ${MKDIR} ${WRKDIR}/.cargo : > ${WRKDIR}/.cargo/config.toml ${ECHO_CMD} "[source.cargo]" >> ${WRKDIR}/.cargo/config.toml @@ -140,7 +141,7 @@ post-configure: --verbose \ ${CARGO_UPDATE_ARGS} -pre-build: +pre-build-OTEL-on: cd ${WRKSRC2} && ${LOCALBASE}/bin/cargo build \ --manifest-path ${CARGO_CARGOTOML} \ --offline \ diff --git a/www/unit/files/patch-auto-make b/www/unit/files/extra-patch-auto-make similarity index 100% rename from www/unit/files/patch-auto-make rename to www/unit/files/extra-patch-auto-make