From nobody Tue Oct 17 17:52:03 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 4S91l821zTz4xnsj; Tue, 17 Oct 2023 17:52:04 +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 4S91l81XjRz4bn7; Tue, 17 Oct 2023 17:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697565124; 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=b9/n83GxaJOYwXr+YVA4mIpIZADtc1KyJNjSiOwKM9U=; b=EZxSZrICFswVv8idrlTJDYc2kTw4zhwj05ufMCVNL4RBocBs/dmswSnHRV4tQnpVl/yLHZ Esfk898s2gMyrI2S8QqdxpKSsB8MNNyBdQirPDhHUdvdg6SYL9y2obXt2uaV/MSVEyW1YQ mZfWDr3OsOY/R3YH+TvT8nhuQne+m1Gianxaok/oEqvHR0f0nwUNS1xRnkL76bFOQHc7NL 7NhJ7TahnfjTxYOg/aKTzz/4PW9EOapCQsBIpoASbY79V84uxuYUMscwkl7+OSwHOf5bZj mhmMq53sLxhf0LAByZJkyLwVwnHkRqKhKmBCZxkG2rbbFjfshtoU2ifwXXkOyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697565124; a=rsa-sha256; cv=none; b=dBCE5/H6zfXANJlbSEw8Jic2lCdDEOr2FiziJNz8p3nTz/0H3HPgPpIUzwsa6z1HXy7VAx zWOX0sXS+iCyqITo5upkt+rB6vfjbl1lSR03GIZPLEMZM4rtdBSOmiytI8/qf5RLJRk8Ix qmgOMqnv79bPFqBp+Qe6dj3HbxtSsdGtzov7lKLpqgG0bzyZwTkPnvMbMqE40lYGBqNGzD p//b7f71O4DRfbKA9HcrowmVHGvlnxfKKdEqZc9Aygb4UYQCP4UVQhBjxoYDqmHrRGcWjB AwOaB3fe8cjpQyauLOLmRnKbqGUjGBs+Ai1d0gDa4Z47ouZK1OhgG6Uu5cHO+w== 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=1697565124; 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=b9/n83GxaJOYwXr+YVA4mIpIZADtc1KyJNjSiOwKM9U=; b=LBFT2aDERD50Mh7mlIJRHzo4UkdxqXe58vMAGICcEXc667spXKyN9csjoXyUnRSFyY+PIy NmxkXuNrUfkhx2i26f5jb0ikyp0lA8G2cnyha29nS/XWMlN7dXyE4m0r3gPtumbL1OuvJg 8q3gn7qMjkHE1OsMerOMOU2dQ7VqDtMibHYJuHHD/FmLowb0kGqidmOWefDZBywU6LEyTY fTuCWyry7UIm26uFt4bbzyQx7kyE2n5hhGon2DxgaqRqDwTgoM2CYZHjXpGY/5YwTNJXh9 HzD/EAF1WcNiMju7oIT6CA2uCghFRNyBW3G2/Ubjx570il5Wq3UB8petp017rg== 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 4S91l80cNWzZFf; Tue, 17 Oct 2023 17:52:04 +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 39HHq3Zt028756; Tue, 17 Oct 2023 17:52:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HHq36S028753; Tue, 17 Oct 2023 17:52:03 GMT (envelope-from git) Date: Tue, 17 Oct 2023 17:52:03 GMT Message-Id: <202310171752.39HHq36S028753@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 7fbe5fd00a13 - main - security/nss: try to fix build in unclean environment 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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fbe5fd00a138a8198b5093a5cde96b938db48ef Auto-Submitted: auto-generated The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7fbe5fd00a138a8198b5093a5cde96b938db48ef commit 7fbe5fd00a138a8198b5093a5cde96b938db48ef Author: Christoph Moench-Tegeder AuthorDate: 2023-10-17 17:46:23 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-10-17 17:51:38 +0000 security/nss: try to fix build in unclean environment ports like net/mpich may install a mpi.ch in ${LOCALBASE}/include and hide nss' own lib/freebl/mpi/mpi.h, resulting in build failures ("unknown type name 'mp_int'"). without a dirty environment of my own to test, this may or may not fix the issue. Reported by: Chad Jacob Milios --- security/nss/Makefile | 2 +- security/nss/files/patch-nss_cmd_dbtool_manifest.mn | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/security/nss/Makefile b/security/nss/Makefile index 50fe4d5171df..d23227ecfc71 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -30,7 +30,7 @@ MAKE_ENV= NSPR_LIB_DIR="${LOCALBASE}/lib" \ NSS_ENABLE_WERROR=0 \ NSS_DISABLE_GTESTS=1 \ NSS_USE_SYSTEM_SQLITE=1 -CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/nspr -Wno-error=unused-function +CFLAGS+= -I${LOCALBASE}/include/nspr -Wno-error=unused-function SUB_FILES= nss-config nss.pc SUB_LIST= PORTVERSION=${PORTVERSION} diff --git a/security/nss/files/patch-nss_cmd_dbtool_manifest.mn b/security/nss/files/patch-nss_cmd_dbtool_manifest.mn new file mode 100644 index 000000000000..a3222958cb13 --- /dev/null +++ b/security/nss/files/patch-nss_cmd_dbtool_manifest.mn @@ -0,0 +1,10 @@ +--- cmd/dbtool/manifest.mn.orig 2023-10-17 19:40:13.402222000 +0200 ++++ cmd/dbtool/manifest.mn 2023-10-17 19:40:35.457563000 +0200 +@@ -13,6 +13,7 @@ + # DIRS = + + CSRCS = dbtool.c sdb.c ++CFLAGS += -I${SQLITE_INCLUDE_DIR} + + # sdb.c is copied for softoken, clean it up on make clean + GARBAGE = sdb.c