From nobody Sun Oct 23 07:52:38 2022 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 4Mw9RC0JXBz4gTgp; Sun, 23 Oct 2022 07:52:39 +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 4Mw9RB4p33z42bj; Sun, 23 Oct 2022 07:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666511558; 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=N4wqFB0ajGHpvCLi6HmAdiSRomofJOSpB6OwEllJ3Lo=; b=t0Q566CYb512lDnvqO1rTb8uevMlW0Htc8YbRYw/v2K0aPI5FeorZiPqC0iO83CyJuSrUP lKxMZrE9Fw9PjBdXcQkwhT4Mz+3UGRFehZmbeC4oosqv3rmaq8IYbU317BJCVSr0UWH/Cz EjNKNRusM2tAUwZEBiBvJw0eAbfzzk6Rn7kMMogFR5Igg0YKjXpvYgUF0MMUS0iIEQFr6C i1YJ7XFwlH6TPfyRlFbmnfQ8em71RMxbChdrlgKGnG0jOLDPX7kiIxzqHTKPmx+FFbuX/o pxe17Tz6Y+sf9XbKE1IAeDkM7kyfGu0VZSbb3cx1Xz+DOPoEOYjyvABBOFZKJg== 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 4Mw9RB3vt4zqK7; Sun, 23 Oct 2022 07:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29N7qc2U028991; Sun, 23 Oct 2022 07:52:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29N7qcug028990; Sun, 23 Oct 2022 07:52:38 GMT (envelope-from git) Date: Sun, 23 Oct 2022 07:52:38 GMT Message-Id: <202210230752.29N7qcug028990@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: 2a6e08e253d0 - main - science/trilinos: Conflicts with googletest 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: 2a6e08e253d04fb167269043f4c74a192758682b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666511558; 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=N4wqFB0ajGHpvCLi6HmAdiSRomofJOSpB6OwEllJ3Lo=; b=SUtc6QBIUkuf1wVSnQMhaRj8W9tSzvjgrqT2TEH2s6pF1YXnZRsu1ebG/L92yA1nFLy1xA GwBJPDlEBbDIrlfgt/+ruHy44qaJa54hvOYQliPwyGBYflvt2Zd7gLQCljSSvVGgnMp4pm gO69zVGVquzQEMoIyqasOwWu5h31nUbBUoT0SLUENIVciHAcQ700cDUZjzzcB0ku46xkT1 zJFRJm7UmDy1T7hMda0W3sQElPAcTvOBQCkwBUMvPUmbLYNUmcMKSmoCMTd0ZV4rsJimWZ zVtwXpt9+jH9NuVSbsmq4oGWEp1ZG/FbsGWZaGq4tJx8Pql3q8Ploai9CQCM2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666511558; a=rsa-sha256; cv=none; b=MHL0SkJBWi7v0s24PsgkDTzSJp2qP909V4O8HZHLpJQaX6xMzomxwcNmPHt9CEVgQwFnTv 1m4EprTodYi1zXIOWHvfHE76iuq12NSZrfHHC94NVzu7FE89PCHGjNsS0YYQst0tOniMN+ HjsUZzG/27ncBdRp69fDLFd2sGAnH1gGOoSDrQoV4gULbNqBXd3oQCnDYiJk+6y/PC2Ydo IKNNfrcVVsohri0cPOydvNpgrJhPXCTZn+wbhAS4qCAnlqhmLlU1C4yAYvZviclg250E+K 9R4R+dOZRhNReItvuwh9Jnjq5fGJDokg3GPticT1YGy9V5euDUabP3OtvgenAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a6e08e253d04fb167269043f4c74a192758682b commit 2a6e08e253d04fb167269043f4c74a192758682b Author: Yuri Victorovich AuthorDate: 2022-10-23 07:51:03 +0000 Commit: Yuri Victorovich CommitDate: 2022-10-23 07:52:32 +0000 science/trilinos: Conflicts with googletest PR: 267283 Reported by: diizzy@ --- science/trilinos/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/science/trilinos/Makefile b/science/trilinos/Makefile index d113106d4211..38d73ac407fb 100644 --- a/science/trilinos/Makefile +++ b/science/trilinos/Makefile @@ -76,6 +76,8 @@ CMAKE_ARGS+= -DAMD_LIBRARY_DIRS=${LOCALBASE}/lib # users: https://duongdo27.github.io/Trilinos/users.html +CONFLICTS_INSTALL= googletest # installs files into the same place, problematic file: /usr/local/include/gtest/gtest.h, see https://github.com/trilinos/Trilinos/issues/11184 + post-install: # remove MPI headers that it installs @${RM} ${STAGEDIR}${PREFIX}/include/mpi*.h