From nobody Mon Jul 18 12:52:01 2022 X-Original-To: dev-commits-ports-main@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 4LmhgR0GnVz4T4sF; Mon, 18 Jul 2022 12:52:02 +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 4LmhgQ1ydxz3n3W; Mon, 18 Jul 2022 12:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658148722; 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=s21kfkqyGZVzsRUUWpQ8wnSh6k5rMFRyuBtiWrCE5QU=; b=olrCodV0r48TVm3D71IXA/9DbZS+R3eMiGW8myQmf9a0KZev8inkPSvUTSUHp86Ug7L1Z7 zHSQh2cDAH6MpIiXqh48J7UWuKG4dDgRIeImUYX9yISP4A+70uFNNSKwLIxNpRcO0wj5nU NVMjVgudZP0+OAdMIDcDMmO8WW67+xXHjcvp3hefNgra7GwCoE4whrZDBrwmkouOxSOdHQ z/yFLSVxj2SbeVgMzwk1DDS3m5duYOdCmY/C6ziXl8RSu13Oax1MTTH8lC3laSwIEzcyyd Q+aIqLws9xFXbozD9PzWhhTnXRHrsFyq9QhTcWCR0/fFgKSvRDdQBGIp/H2NMA== 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 4LmhgQ04k1zg3m; Mon, 18 Jul 2022 12:52:02 +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 26ICq1MR092175; Mon, 18 Jul 2022 12:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26ICq1Lp092174; Mon, 18 Jul 2022 12:52:01 GMT (envelope-from git) Date: Mon, 18 Jul 2022 12:52:01 GMT Message-Id: <202207181252.26ICq1Lp092174@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: de6021150895 - main - science/openems: Fix build with HDF5 1.12.0+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de60211508958485595161815c016b3ea5466e22 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658148722; 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=s21kfkqyGZVzsRUUWpQ8wnSh6k5rMFRyuBtiWrCE5QU=; b=IxsKNRNbVJ8UrvvlyzsLVt/iofZ4WiD10j33R67nGXCvms+4iByw4f3R1DiHjDhNK3NaGX eWW3ze5LEaVK9NF4FyLV3AD3+Q4ngIRSOp7vYBifWx3tuBBK5rn79Y7zx+S7onz74rUDjx BaAcPzWk+VIYjRrEII7p25zTLwXT4egb2Pv7N/RBn3jRSpZMYxqiQ8QHqDuf4z64ztXTYl J/9CLsDfkg1xYwUKGirtbeFh8b+3GYbxLyAdy3HacXzmFlrR8fAjzGRlQoqlv7cm1iITU+ dHj0PG2suhfRbzysN9dkn/3PLeIzcQhaKN0AFxtPvuTAdjyVUaWYEmnT//DiNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658148722; a=rsa-sha256; cv=none; b=uHZwkWzujQKcK2Xt2Jlz86XwYczb57TPmyv49cVSgkq+/ncAn6EvEVjeynXc4A3QlnPDJW c5d3KAoX0wqygDSrot1Ql1RLLbZoCTte53DxPDx0PPhbnGt7dCK7mF/rpphwpwx8YfwKCM j9bgMpjJZpjN+rkhJ7ngQIxe3DffvXvccPNwle6yyzUlatSejyJTOBFw1BEfysEamritog TnDGtTICoXncRDllaRuEBj6dT5MIpKycN3MwUX3/FvqphUe3EW2A/e46W/0p5jIcE/f0TX XNfIcSCTT/f2GgflyI2KiyTddJLpw9ImkD2T3h1bVq/DK6mbVMFYBBaqNYnQkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=de60211508958485595161815c016b3ea5466e22 commit de60211508958485595161815c016b3ea5466e22 Author: Po-Chuan Hsieh AuthorDate: 2022-07-18 12:50:24 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-07-18 12:51:28 +0000 science/openems: Fix build with HDF5 1.12.0+ --- science/openems/Makefile | 3 ++- science/openems/files/patch-hdf5 | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/science/openems/Makefile b/science/openems/Makefile index 3488ec1e3236..f7d5c0db03d2 100644 --- a/science/openems/Makefile +++ b/science/openems/Makefile @@ -31,7 +31,8 @@ USE_GITHUB= yes GH_ACCOUNT= thliebig GH_PROJECT= openEMS -CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 +CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 \ + -DLOCALBASE=${LOCALBASE} CXXFLAGS+= -I${LOCALBASE}/include/fparser # fparser.pc probably returns a wrong value diff --git a/science/openems/files/patch-hdf5 b/science/openems/files/patch-hdf5 new file mode 100644 index 000000000000..b88530ce9aa7 --- /dev/null +++ b/science/openems/files/patch-hdf5 @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2022-02-15 18:12:06 UTC ++++ CMakeLists.txt +@@ -114,7 +114,9 @@ message(STATUS "TinyXML_LIBRARY: ${TinyXML_LIBRARY}") + INCLUDE_DIRECTORIES( ${TinyXML_INCLUDE_DIR} ) + + # hdf5 +-find_package(HDF5 1.8 COMPONENTS C HL REQUIRED) ++set(HDF5_INCLUDE_DIRS "${LOCALBASE}/include") ++set(HDF5_LIBRARIES "-L${LOCALBASE}/lib -lhdf5 -lhdf5_cpp") ++set(HDF5_LIBRARY_DIRS "${LOCALBASE}/lib") + INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRS}) + link_directories(${HDF5_LIBRARIES}) + # hdf5 compat