From nobody Thu Jul 21 16:38:22 2022 X-Original-To: dev-commits-ports-branches@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 4LpdYC3vtLz4X26V; Thu, 21 Jul 2022 16:38:23 +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 4LpdYC1fxjz4QFQ; Thu, 21 Jul 2022 16:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658421503; 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=httxJLTiUKlWOUX63au8w2Ml67BJiyHZr34gGcl1SyA=; b=JOe5WOOLSi9FmIwfmBLoU1RDZQ9qIgCI+Dy1dTqR/a+CeFfmV4+DCWmZkkaUU+iCegOCks oPcTa5tVnaAXuyTR5e7I0H6DuI/7hS7CPaSWtaErXK2l4FeWv+p3nhgCGpu/C7/ndnb/Xl BSe3lhCPUf5oq8/+CDNP7t2gFvoCwRB7MznNro+djeeeR3vFGXWQmdZKXhdsr9ORME6y/u miVX8DmrmZZragLpRjJXKjHqyUMbI5nJLB/zbbnMqJwD3Ynj2K+v2Nu4duh20ptHcQS7Oi SWHZW5cQUCdSkyMBEsZuX0yKuXkE7b3fSfzwEgZxtxPotqTnVTGwPZWNdrxwXw== 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 4LpdYC0kB8zT3s; Thu, 21 Jul 2022 16:38:23 +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 26LGcNei034855; Thu, 21 Jul 2022 16:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26LGcMTC034854; Thu, 21 Jul 2022 16:38:22 GMT (envelope-from git) Date: Thu, 21 Jul 2022 16:38:22 GMT Message-Id: <202207211638.26LGcMTC034854@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 4a95268b93c5 - 2022Q3 - science/elmerfem: Unbreak by removing link flag -lMPI::MPI_C List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 4a95268b93c583e99858a184271fae27365b61d8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658421503; 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=httxJLTiUKlWOUX63au8w2Ml67BJiyHZr34gGcl1SyA=; b=pfw7EUTVjWymfS1PBux0k9Yt6sa/xc710SBu8fal1vgpqCqujMlR58cTftVGCF/f4IXK2i KVg+5mWW8pl2QqOB3P1TuSttxxN4ylGKVyogk6RO1sTDM+8gRdeTNTiVodzfyDQmEyZ1e/ iYEIkqQE5+9Y32r3hcIAhdn6OQkjVM+qsRH0hjiMCOXHIMWOIC7jru9/WscNqZWzrrYouD F4orv0GVp5slQr3IijKnR8SCTaqBf0sxf2sRs+vh9PXAOtMCdUICoColMUZmxslxVlsqYF xh+vDa1ApCqZ29kcKOiI3xLopkTOEx1PQIHJ6yxIedzFZ3L/8aQHPTrOFTUCBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658421503; a=rsa-sha256; cv=none; b=b5fAk8IoVgvUvh3NDJfXsqDLjI4qK9S0JcRMY3TqQwaiA4msUiLp5v6xWxFxGduvBT6HNu D1D5my3doxHV9etnw8z52gkcyPQqChe670HlGnQ3Ej1SJRaLO9ovTNXo8V6B4+06Bi1eVu q6UKIprX0ZsSLXJoaP+E0lgu7dl9yaOkYAdldRF1qALEOUzHjvW6b+ir0Q5ObDlRdaA0lq X/9mGeV5rPGsCav/UIyVKb4s/jJrkF+/hjTfz3mN5aUH84qs8k1DHSoj7lu600X7Z8HjS7 jAAN0VUUuAHV8spKUpubDr7N9B6vYH1lM0Mjhv9o0jv309kPVMijL9pbAhmpqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a95268b93c583e99858a184271fae27365b61d8 commit 4a95268b93c583e99858a184271fae27365b61d8 Author: Yuri Victorovich AuthorDate: 2022-07-21 16:36:30 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-21 16:38:13 +0000 science/elmerfem: Unbreak by removing link flag -lMPI::MPI_C This flag causes build failure. Its origin is unclear. Reported by: fallout Approved by: portmgr (unbreak) (cherry picked from commit 741edec0685d80c641a071f0bdcf2d5e82019962) --- science/elmerfem/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile index 7d42a1de33cd..d541eb069802 100644 --- a/science/elmerfem/Makefile +++ b/science/elmerfem/Makefile @@ -100,6 +100,10 @@ post-patch-OCC-on: @${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \ "${WRKSRC}/cmake/Modules/FindOCE.cmake" +post-configure: + # workaround for https://github.com/ElmerCSC/elmerfem/issues/334 + @${REINPLACE_CMD} -e 's| -lMPI::MPI_C | |' ${BUILD_WRKSRC}/ElmerGUI/Application/CMakeFiles/ElmerGUI.dir/link.txt + post-install: ${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver ${LN} -sf libelmersolver.so ${_LIBSTAGEDIR}/libelmersolver.so.0