From nobody Thu Jun 16 15:14:15 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 3F722836094; Thu, 16 Jun 2022 15:14:17 +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 4LP5LJ21SPz4WR8; Thu, 16 Jun 2022 15:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655392456; 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=OPAStW6tagQ/YWuEdMF2TbuvESd/tnO+ZTU9ffyezbo=; b=BEJQ6bqqkhzgAxcBKuUB70GrhcgNOGG6Uwz+bQK380n3x/tIk5ERESqrlEE2X6LN6lgRYA IJ/Pd0Y/RfV0fWU2S5cz4oxycD4VR3BVi2ULCQiiruIAJGHFgmrK+XGWJh8ZrBWitTeJ9t 2jYxjIlr0f00KwcpXWZDw9KEiG/AI5HiFhokYCKXfuK0EE5qFhs0Fd6lzEnh7T5b9wk4DI w2IrjK0ebN1TfpcQp/Lah3CydXG1DMz3cfmd8oZPCPwAHTpfff6JIRNRvOeo92hEJazgek gNO4MiuKyAJUS8Xy3+jOEAdwdXxeq2Aesc/sKB7JZKdC4lOw5T/dM0dqVRM3rQ== 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 EF2635C88; Thu, 16 Jun 2022 15:14:15 +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 25GFEFHi011325; Thu, 16 Jun 2022 15:14:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25GFEFvZ011324; Thu, 16 Jun 2022 15:14:15 GMT (envelope-from git) Date: Thu, 16 Jun 2022 15:14:15 GMT Message-Id: <202206161514.25GFEFvZ011324@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: 9f1657899a68 - main - science/silo: Fix build with HDF5 1.10.8+ 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: 9f1657899a689c2d44f361bbdce3f5e67fa2c7d4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655392456; 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=OPAStW6tagQ/YWuEdMF2TbuvESd/tnO+ZTU9ffyezbo=; b=xasVjlkW7DF1HHrTKMEwFvEdtbOUKx3Rnl1OOke+1CP0ZwKxmoiFgh3iJbAGASxd2cBCub 7RsILyeYrkhymiZY6QZEB/UbJFgdkqXDMZTzqm98OtpxssQHEa8tdo3pO5k4BxW2Ba63yS JNJeb5TkpuNnJ/la+ysUpIqjF2ABSeT74D+pSCH2KP0HM3XEfl8/FpiDTgTzTsiclVZNxK hrOU/dr6+GcV+l8pfb8LZ44OPtvyeB32DD5npuH5KvxOxE/yseagXTluo5HYhuk4CfBpEy KDGxirr4b8SEA5tIqdlN1/4gBvntcXmDXunbanJYhY52gq9n4TpZD9a1+RwR1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655392456; a=rsa-sha256; cv=none; b=YGwUQ6oPGyTnuePMXkUXjDgUN+B8DiqrIdrdSzYYZv5XciZH+974WPDRI6Ym2V4jMWTgpE uHWgiMTA179/LfzUTd8F/kX2To3berjTe589H8tK3MG7OU4/MjuNC0KWva2LEjOmaKK/k5 4XLiLVb6CQ/gMKesNn4Yk5BZFcU5jtrORlvBNVL5Jyesfjlffqj+gWZw4ri3WhoJIosrWN Tywm4UCy509So36Uvhpp55SAxQ09epJpu4XEBkObCSMUdNE0HXIFeZ1jXiTpDOdSrFHMQl RBCpQ/yKv8lITYO2RQsiyJLVP9OWwlIkujiQItJMIhABMVJZYHHehn+Q2J+91g== 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=9f1657899a689c2d44f361bbdce3f5e67fa2c7d4 commit 9f1657899a689c2d44f361bbdce3f5e67fa2c7d4 Author: Po-Chuan Hsieh AuthorDate: 2022-06-16 15:12:06 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-06-16 15:13:02 +0000 science/silo: Fix build with HDF5 1.10.8+ --- science/silo/files/patch-src_hdf5__drv_H5FDsilo.c | 42 +++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/science/silo/files/patch-src_hdf5__drv_H5FDsilo.c b/science/silo/files/patch-src_hdf5__drv_H5FDsilo.c index 5957219a342f..7b05cc0a87fc 100644 --- a/science/silo/files/patch-src_hdf5__drv_H5FDsilo.c +++ b/science/silo/files/patch-src_hdf5__drv_H5FDsilo.c @@ -37,3 +37,45 @@ #endif /* !defined(HDfstat) || !defined(HDstat) */ #ifndef HDlseek #ifdef H5_HAVE_LSEEK64 +@@ -255,13 +243,13 @@ static const char *flavors(H5F_mem_t m) + snprintf(msg, sizeof(msg), Msg "(errno=%d, \"%s\")", \ + Errno, strerror(Errno)); \ + ret_value = Ret; \ +- H5Epush_ret(Func, Cls, Maj, Min, msg, Ret) \ ++ H5Epush_ret(Func, Cls, Maj, Min, msg, Ret); \ + } + #else + #define H5E_PUSH_HELPER(Func,Cls,Maj,Min,Msg,Ret,Errno) \ + { \ + ret_value = Ret; \ +- H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret) \ ++ H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret); \ + } + #endif + +@@ -1308,7 +1296,7 @@ H5FD_silo_sb_encode(H5FD_t *_file, char *name/*out*/, + assert(sizeof(hsize_t)<=8); + memcpy(p, &file->block_size, sizeof(hsize_t)); + if (H5Tconvert(H5T_NATIVE_HSIZE, H5T_STD_U64LE, 1, buf+8, NULL, H5P_DEFAULT)<0) +- H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1) ++ H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1); + + return 0; + } +@@ -1336,14 +1324,14 @@ H5FD_silo_sb_decode(H5FD_t *_file, const char *name, c + + /* Make sure the name/version number is correct */ + if (strcmp(name, "LLNLsilo")) +- H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1) ++ H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1); + + buf += 8; + /* Decode block size */ + assert(sizeof(hsize_t)<=8); + memcpy(x, buf, 8); + if (H5Tconvert(H5T_STD_U64LE, H5T_NATIVE_HSIZE, 1, x, NULL, H5P_DEFAULT)<0) +- H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1) ++ H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1); + ap = (hsize_t*)x; + /*file->block_size = *ap; ignore stored value for now */ +