From nobody Sun Mar 31 02:35:00 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 4V6dXN4TlYz5GZjg; Sun, 31 Mar 2024 02:35:00 +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 4V6dXN1jFZz46fJ; Sun, 31 Mar 2024 02:35:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711852500; 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=tx2YCrRs7uIfdrBL6u81e2ATIKW91h7qh+Nmedixjsg=; b=VFkvWq4nUXGg7fQP0cW4Aj6vkR73830P2b2TQjo2P/LFnJsYO1QnEAWQsz/MVCNFKUbY7C BLupeXtI1eIwBgWGdKHdmoCKPIH3/hXumHuHgJLbMqczvMR0wTXwf7rdIRd4O0CqUMA5W3 USfuaWgQCxbIoBnMmVsMYF6RmqH6rMnVhQXxBE4f8Z9do0Eu+WMW2lE7HRrw1lHBRwia0s XITAqso/HlD7Z0NwGhNmpCV0kCKN6APvd6abxl7pFFtsvwLAP5kkgDGd+M2wD4hRwc0lTm pALeiBooFRnb2yCclxZx8xuuBv41zW7+gB5D/EjrIgk6/ZoukSgBqfdkWstDwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711852500; a=rsa-sha256; cv=none; b=X57vY9/5eX8xjbXWA+jKZEDLF/zIrc1NAefDkkwlTPJ/kOrxHFDVj/LjjLtHOLwLW2a/dp TH5tWm2ggh3TGHUub8qvoC6kW1pRyyGUIgXx6pF1aApjWKnwvWSR1UriQrd1kSSvJ92xmq 7YzNKuHI4uf2LeFyTxClkVK9MEvnLxqatyDXfY/RXzE6nHes10NBtAXpANppPER5APcubI vsKX52buEZS5gSCT9Jtnp6HRiJGv3ebt2IR3iLCzE1FnvzEWroQfKnPn2QS8CbLPNzO/jL Znmw5WVN2I20kNuOE1JC8QlG9gJDkg8uQTK9C2jWB1FdOdFVegrDk4a6NuYIOw== 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=1711852500; 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=tx2YCrRs7uIfdrBL6u81e2ATIKW91h7qh+Nmedixjsg=; b=fIjaPWjzQEwyOhg/bdyWVdb6H4ssHVNUJVOLggsBY3MjlCNI5LQd9sZpQfVeLCEWlAfkf+ NwWMsWMPvFxH1qWIYiTY1u6JHYPkece8RlniSUNVTiPEkWHidsFxA1AEVfsfD931nkEWFb I5GSEYd8vaMDbGIX9cIc1w9b04fVtAqhBohDrM7A+569TUweYgt+CiWi6jRJAKsRopTyAQ lT6oHmj00gA6pOq9bXQG1L9JtJO9hukN7PaHAuCedVl15//BXIHoMxOBeBt1eIRCECIy4g x21aHQ1PRn49pibi++6MBqJorpR65dB44efiHkpdvotcfOSWHMUqLRgLR8AjKQ== 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 4V6dXN127SzKjq; Sun, 31 Mar 2024 02:35:00 +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 42V2Z0Bx070053; Sun, 31 Mar 2024 02:35:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42V2Z0tP070050; Sun, 31 Mar 2024 02:35:00 GMT (envelope-from git) Date: Sun, 31 Mar 2024 02:35:00 GMT Message-Id: <202403310235.42V2Z0tP070050@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: e0a8cc0d3378 - main - net/mpich: Fix failure to build when devel/uthash is installed 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0a8cc0d3378269c5e7681ae4177a85e1b8baaf8 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0a8cc0d3378269c5e7681ae4177a85e1b8baaf8 commit e0a8cc0d3378269c5e7681ae4177a85e1b8baaf8 Author: John Hein AuthorDate: 2024-03-31 01:52:59 +0000 Commit: Yuri Victorovich CommitDate: 2024-03-31 02:34:54 +0000 net/mpich: Fix failure to build when devel/uthash is installed PR: 265684 --- net/mpich/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/mpich/Makefile b/net/mpich/Makefile index cc286bb6b560..1b80b870bdb6 100644 --- a/net/mpich/Makefile +++ b/net/mpich/Makefile @@ -1,6 +1,6 @@ PORTNAME= mpich PORTVERSION= 4.1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net parallel MASTER_SITES= https://www.mpich.org/static/downloads/${DISTVERSION}/ @@ -65,6 +65,7 @@ L0_CONFIGURE_OFF= --without-ze CONFIGURE_ARGS= --enable-fast="" \ --with-libfabric=${LOCALBASE} \ + --with-libfabric-include=${WRKDIR}/include \ pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ MPICHLIB_CFLAGS="${CFLAGS}" \ CFLAGS="-I${LOCALBASE}/include/json-c ${CFLAGS_F2018}" \ @@ -115,5 +116,9 @@ post-extract: post-patch: ${RM} -r ${WRKSRC}/www +# To avoid pollution from ${LOCALBASE}/include, set up the build to look in +# ${WRKDIR} for libfabric include/rdma/ header files (see --with-libfabric +# configure args). + ${MKDIR} ${WRKDIR}/include && ${LN} -s ${LOCALBASE}/include/rdma ${WRKDIR}/include/ .include