From nobody Sat Dec 21 21:24:11 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YFy2z4DVrz5hVbl; Sat, 21 Dec 2024 21:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YFy2z2stpz4wbC; Sat, 21 Dec 2024 21:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734816251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vOG+WnBbCqh9fGk6dJt3i2dKxgFZ21RuJmyihAjA8FU=; b=NkI4cNA/GTrAZ8uByhnai+9gASePaailgZv5b7/Ge3VxlYaVWtRN/CDTIwUSVZobdUVHt8 h4/IvUDs+DAg5qkP8Fgugo8NO9ommEIhZhQJDzUbxIhN7+lO/XTTWvQDnemZh2Ga0SB3aV ZzXf/uYoFvURCKWnNg1INL/IsxiWIOdrvgEZjH0CX52DEL8U/ssCLDn5GiV0Sh/fpJ/Jqk w57y5tR1UNmqf3Ev367pSB3wgldqq83lkWQyqZ/4qaMTWIR9HB7V6zSrwgBcwEBMGDbMNv 5zvYtJkAPL+U6ALXtCGyjjBJlqnQF7UDgZlsbjSj2KzhVRb4H26/v0+CpKP6aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734816251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vOG+WnBbCqh9fGk6dJt3i2dKxgFZ21RuJmyihAjA8FU=; b=wjzSe/voH9UGEyRYb6Fqsl7xxiZWUGu1cooSQ72ZM/lwIm0rXOzRcjrwoMEOa4nCVlvERq EG1N3WPNKmrmyj8ewryVXsgF+gvs6T2TVRpkUKeZy8TR5lWJ50to/8X9beDX4MzPcTqO02 oaizEOLBNfEhOqjc/6s1pc4MqNACcEntJXOzs/i35yFDXuKg8BIvoUea/FJKCj1GRmzEJO iDGYD/H3O7w3tNYkopc4/hVPaQXiNvUk7z19aEjVpuI9Drq/U1Vef1LZjO4hD5ZNSflUE2 l08SbfOLbOdwXJxjQAHvvHHDQRAzANkdm3sYtDqsQuMNPKOfmW+97qPZA3ZA7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734816251; a=rsa-sha256; cv=none; b=p0yGZiqZTcde5y0xUWAgOy2fktfOhyzm7Sm4hrIf2fWqWmIr6TYtFHrnC2xmu1uDOo/K29 5OLywxFhQwphRlas8yuQJpEokP/ppXGBv5CNuJ32WpdztTpJLqurIFBeuBhzXycxEQnHDx sUQYo5/AjHi0JFDDREOhwAMLu/cCXS1Z5VKj8H3R0ffWvC1jHDEE1HswgwMZDjyTzX5bEC u16WCYClr3dm4nJFGzTl3mGShQNCPnj5fs0d9UCqud6ISlzJN24UtK/PPQYX7M6KZPagp5 WxvNNkSBh+oMU8oh44o0yAlcHjXyi8q6NlxBUFK8PD3MgnMsFhWTOVK4O3ciig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YFy2z2VCHzgvs; Sat, 21 Dec 2024 21:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BLLOB6h058075; Sat, 21 Dec 2024 21:24:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BLLOBGb058072; Sat, 21 Dec 2024 21:24:11 GMT (envelope-from git) Date: Sat, 21 Dec 2024 21:24:11 GMT Message-Id: <202412212124.4BLLOBGb058072@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: ea1541625221 - main - www/unit: fix build failure when its run without OTEL List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea15416252218fda847ff7f485c7ff4a6163861f Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea15416252218fda847ff7f485c7ff4a6163861f commit ea15416252218fda847ff7f485c7ff4a6163861f Author: Sergey A. Osokin AuthorDate: 2024-12-21 21:23:02 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-21 21:23:02 +0000 www/unit: fix build failure when its run without OTEL Reported by: Geraint Edwards --- 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