From nobody Sun Sep 17 15:32:58 2023 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 4RpX4V6sdjz4t5h3; Sun, 17 Sep 2023 15:32:58 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpX4V6Q3mz4Rhf; Sun, 17 Sep 2023 15:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694964778; 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=gmxxRqveOtnwWHtTCcHYFShjpebhg4/791oxF0+f4UQ=; b=C62ZdlTNi1zKIGBzOndotySoJY7R3CQ+fsKLqybElAQdCNT7neZS77QSGlk31QCUI37YDB hOfLDvTgXV7IsS43mxa8R2oJphCBSVtWjrUlTxhDn0ncYPOGx4lL6/9+szf6ufKaoT4sDG puzb8r4lMHNL6XZIXNv0g73K7P7IceYbWSBfroBVyL/sxuLI149SXPz3GFGLWMO1Py5zvD VwpL5MqIG3aOFZkebgm9cilhT15mYWibTrKNGPj+V9ANSReyTZcMNYfOobnBt4mMJDg6sf yMEMAVjti4vQM8IxPl+ypoKuTnhJlFffhxjQCOO4sHZ/H8EzfHgLXizEk4UVuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694964778; a=rsa-sha256; cv=none; b=KNQ1bc38ZmLyAW7GqfISdn2ZJlC8L80m95oxdIFWU9xZF7E6Sruzz9bBvm/Q57PXLwVJtg SVW/kp4Vk36RCKBosWAmPqxJr78PLXSKLIvqFZu69d5OZNYn+tjRTpGbCINTFrzHgiJuXC dGt3kGm0rFqY76XZDm5Eg/lLhG9aiuw3vi4S3Lzrv4Ez3EQJ49ignUyvmLaewyjhvxZclX aQG75o0lk3ZCaRxfqR2n8NMmZXcteuZzbG95R0JvB+LvOJ0YkJfCDWezDSdIO9nBJ7qU1M CZVbYs4mq9T/N0LB3qWBfo/ywxuacqRDBstLczZPGykXclg6r8ZQJWsAkH6biw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694964778; 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=gmxxRqveOtnwWHtTCcHYFShjpebhg4/791oxF0+f4UQ=; b=j70c3WTStsfKQkaKyDLEDNMVB+68IpJPoAMXxrknl7RugWkYBupsbAYHQ8EJuCwKY0T39r WlOzXaxGmF7DoPYVBPkcFG574N/3ykSKBmQcHE5OVrrLyPK6l+LFKJ/wOC6GzXIC3VCw9t sm8rbsoPAcQSNqp/v7dIWj7uF9jiNKu2G2IDXzsOr5lma6Um9o79SJHsqXX+E1mL0h+SBA YNEumGKWH+rwTweWDg/AAHD5d3Ciyz0jbT0amgRwjd9r/H02iiY0OfG+QfuNE3oaRtlJvX lzuWCgyPEGwL/4cEobTyQluL38uVtufPAvTXEYVi1VLLGk047BpA9n4kWwCmAA== 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 4RpX4V5TtRzvHG; Sun, 17 Sep 2023 15:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HFWwDL023099; Sun, 17 Sep 2023 15:32:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HFWws8023096; Sun, 17 Sep 2023 15:32:58 GMT (envelope-from git) Date: Sun, 17 Sep 2023 15:32:58 GMT Message-Id: <202309171532.38HFWws8023096@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: c39a8b992c33 - main - www/nginx-devel: fix OTel module build (+) 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: c39a8b992c33a9566e862f4e9d4d2f7a3f2ce5b3 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=c39a8b992c33a9566e862f4e9d4d2f7a3f2ce5b3 commit c39a8b992c33a9566e862f4e9d4d2f7a3f2ce5b3 Author: Sergey A. Osokin AuthorDate: 2023-09-17 15:30:03 +0000 Commit: Sergey A. Osokin CommitDate: 2023-09-17 15:32:45 +0000 www/nginx-devel: fix OTel module build (+) Special thanks to: pluknet Bump PORTREVISION. --- www/nginx-devel/Makefile | 5 +++- www/nginx-devel/Makefile.extmod | 1 + .../files/extra-patch-nginx-otel-config | 34 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index a89a55c942d8..3039e40225ae 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.25.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -324,6 +324,9 @@ pre-configure-SMALL_LIGHT-on: do-configure-NJS-on: ( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} ) +post-configure-OTEL-on: + ${CAT} ${WRKSRC_otel}/src/modules.c >${WRKSRC}/objs/ngx_otel_module_modules.c + .if !target(do-install) do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index cc07a20f6508..06adb9f018d1 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -258,6 +258,7 @@ OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \ libre2.so:devel/re2 OTEL_BUILD_DEPENDS= ${LOCALBASE}/include/opentelemetry/proto/common/v1/common.proto:devel/opentelemetry-proto OTEL_CONFIGURE_ENV+= NGX_OTEL_PROTO_DIR=${PREFIX}/include +OTEL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-otel-config PASSENGER_NGINX_VER= 6.0.18 PASSENGER_CATEGORIES= ruby diff --git a/www/nginx-devel/files/extra-patch-nginx-otel-config b/www/nginx-devel/files/extra-patch-nginx-otel-config new file mode 100644 index 000000000000..acc11ca78cd0 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-nginx-otel-config @@ -0,0 +1,34 @@ +--- ../nginx-otel-f58abc0/config.orig 2023-09-16 12:52:34.000000000 -0400 ++++ ../nginx-otel-f58abc0/config 2023-09-16 21:19:32.540843000 -0400 +@@ -223,7 +223,7 @@ + ngx_feature_run=no + ngx_feature_incs="#include " + ngx_feature_path="/usr/include" +-ngx_feature_libs="-lgrpc -lgpr" ++ngx_feature_libs="-lgrpc -lgpr -lgrpc++" + ngx_feature_test="gpr_log_verbosity_init();" + + autocppfeature +@@ -236,19 +236,18 @@ + ngx_feature_path="/usr/local/include" + + if [ $NGX_RPATH = YES ]; then +- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lgrpc -lgpr" ++ ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lgrpc -lgpr -lgrpc++" + else +- ngx_feature_libs="-L/usr/local/lib -lgrpc -lgpr" ++ ngx_feature_libs="-L/usr/local/lib -lgrpc -lgpr -lgrpc++" + fi + + autocppfeature + fi + + if [ $ngx_found = yes ]; then +- ngx_module_libs="$ngx_module_libs -lgrpc -lgpr" ++ ngx_module_libs="$ngx_module_libs -lgrpc -lgpr -lgrpc++" + fi + +-#ngx_module_libs="$ngx_module_libs -lupb -lz -lm -lrt -lssl -lcrypto" + ngx_module_libs="$ngx_module_libs -lz -lm -lrt -lssl -lcrypto" + + . auto/module