From nobody Tue Jan 10 18:27:44 2023 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 4NrznX2WFhz2sNgB; Tue, 10 Jan 2023 18:27:44 +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 4NrznX20Pxz4CQ5; Tue, 10 Jan 2023 18:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673375264; 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=bEr6yUFeBC5iVe+PWD5HcJNSL5t8iernUP8K80QVaus=; b=PrULDCFlPm1R3TD3FUqqA0QG8M3Kt7p1RqQlUhm/ir+QSqU662ziePaBWRawd9SLDpQIhx 475TC8TjPcaNlea6h0G//LgvX1dGCFx8zWHzUTlipgbDWLhA1BpoBe0ZAMfWnCZmnToId1 8Mhh37aOS8j9ylF/W3+/5y6Pb1MR8Jf0tab5y9tDm1gQhgE9jacGQ8sx7yhwNyj9QEGVmm 8kSKXVBFwS3jzZfzhUVUcLEr2HIOxcfkLs3X3SCESu/ye4ZPW2TR9D1udQl1Ie559pAMSK ugYqb5TOHxGDB3auISfGtcHfA9XMe/z4oZr/ml6rURLxtm6AsUTVRhIlqSopXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673375264; 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=bEr6yUFeBC5iVe+PWD5HcJNSL5t8iernUP8K80QVaus=; b=HLagKVPW7Q/Z33mPYrI/dEBFS0JwNXcqRyh2Yv+oVx3EDr52nOML/DBylvIb9kF4uwLXPl HPcBSj/KPLtevNo9y6tgK7B9ajO1UW/DztlA6Yjx1H3poyPnsv1oWUkyYzSRcxm3Qj/yPb wrtlTAP6Tfq0cpE3anG3lX/APsYYBytF+w15cTA21v+ecpEd3evLx1ShK5S+UrZqAf+ift xabIUzTym+XxbgsDWNQMDUkh/1r0+Bsq9/qqABIg/Vv3krNNMAp5yag31n1k0DfpYVTA0s AQsiIFF/bn6PYKiN7Y+QMAZGVWETD7gvRUTK4VLEXC5P8vkWKSm2Qf4mKWOsEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673375264; a=rsa-sha256; cv=none; b=KJ415QEpskigs+g6aEk/7TLMF9zMKBWvhzemEpi5HxZfEdnlRE/S1AP8EzRdaxgHnevi9E XWnUHAn9oNwquD7hJkl5sR2FlQuAmE+ygQjfVONkyH6+2C7KGwcuYxsVCI3/WRyO0tcM/u nMSv6U5CHnYwOFVQ3leD4sZvqZiI8jFxdo5TJkuZBdhf9o05DRH0a0NHBAi/Q35BROQSK7 vXaOgjbKCKtGsRhPjI12Z9wDKTXNyyAvji4TmYztchlBbd+T4vFgjAhEuDxHPp9g0tZNZH 25OoEWCdC4YUWMze02hK/hI9PR6/QUyBfgrw9B6NZOZHekN8XUEI/UroZKsB9w== 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 4NrznX13NPzJSw; Tue, 10 Jan 2023 18:27:44 +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 30AIRi0R081946; Tue, 10 Jan 2023 18:27:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30AIRiKW081945; Tue, 10 Jan 2023 18:27:44 GMT (envelope-from git) Date: Tue, 10 Jan 2023 18:27:44 GMT Message-Id: <202301101827.30AIRiKW081945@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 85723e5e46f7 - main - science/silo: fix build with clang 15 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85723e5e46f7acb9f4403aace3b5192dab15c30e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=85723e5e46f7acb9f4403aace3b5192dab15c30e commit 85723e5e46f7acb9f4403aace3b5192dab15c30e Author: Dimitry Andric AuthorDate: 2023-01-10 18:15:27 +0000 Commit: Dimitry Andric CommitDate: 2023-01-10 18:26:30 +0000 science/silo: fix build with clang 15 During an exp-run for llvm 15 (see bug 265425), it turned out that science/silo failed to build with clang 15: /wrkdirs/usr/ports/science/silo/work/Silo-4.11-68-g819658e/src/hdf5_drv/silo_hdf5.c:1869:13: error: incompatible integer to pointer conversion passing 'char' to parameter of type 'const char *'; take the address with & [-Wint-conversion] DB_OBJ_CASE(DB_CURVE, DBcurve_mt, npts?1:1, yvarname) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /wrkdirs/usr/ports/science/silo/work/Silo-4.11-68-g819658e/src/hdf5_drv/silo_hdf5.c:1812:36: note: expanded from macro 'DB_OBJ_CASE' (*dsnames)[i] = strdup(m.MEMNAME[i]); \ ~~~~~~~^~~~~~~~~~~~~ /wrkdirs/usr/ports/science/silo/work/Silo-4.11-68-g819658e/src/silo/silo_private.h:939:35: note: expanded from macro 'strdup' #define strdup(s) _db_safe_strdup(s) ^ /wrkdirs/usr/ports/science/silo/work/.build/include/silo.h:2214:68: note: passing argument to parameter here SILO_API extern char * _db_safe_strdup(const char *); ^ This turns out to be a bug in silo, which I reported upstream in https://github.com/LLNL/Silo/issues/296, and which was fixed in https://github.com/LLNL/Silo/commit/be29ddf. PR: 268864 Approved by: yuri (maintainer) MFH: 2023Q1 --- science/silo/files/patch-git-commit-be29ddf | 44 +++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/science/silo/files/patch-git-commit-be29ddf b/science/silo/files/patch-git-commit-be29ddf new file mode 100644 index 000000000000..fba494b0b956 --- /dev/null +++ b/science/silo/files/patch-git-commit-be29ddf @@ -0,0 +1,44 @@ +commit be29ddf0352bc8e5a7eecc8772a3acb64dfde18c +Author: miller86 +Date: Fri Dec 2 19:00:20 2022 -0800 + + fix obj-case-macro + +diff --git src/hdf5_drv/silo_hdf5.c src/hdf5_drv/silo_hdf5.c +index 17af250..c45d689 100644 +--- src/hdf5_drv/silo_hdf5.c ++++ src/hdf5_drv/silo_hdf5.c +@@ -1809,7 +1809,7 @@ db_hdf5_cwg(DBfile *_dbfile) + *dscount = m.MEMCNT; \ + *dsnames = (char **) calloc(*dscount, sizeof(char**)); \ + for (i = 0; i < *dscount; i++) \ +- (*dsnames)[i] = strdup(m.MEMNAME[i]); \ ++ (*dsnames)[i] = strdup(m.MEMNAME); \ + break; \ + } + +@@ -1857,15 +1857,15 @@ db_hdf5_get_obj_dsnames(DBfile *_dbfile, char const *name, int *dscount, char ** + + switch(_objtype) + { +- DB_OBJ_CASE(DB_QUADVAR, DBquadvar_mt, nvals, value) +- /*DB_OBJ_CASE(DB_QUAD_RECT, DBquadmesh_mt, nspace, coord) wont work for rect case */ +- DB_OBJ_CASE(DB_QUAD_CURV, DBquadmesh_mt, nspace, coord) +- DB_OBJ_CASE(DB_QUADMESH, DBquadmesh_mt, nspace, coord) +- DB_OBJ_CASE(DB_UCDVAR, DBucdvar_mt, nvals, value) +- DB_OBJ_CASE(DB_UCDMESH, DBucdmesh_mt, ndims, coord) +- DB_OBJ_CASE(DB_POINTVAR, DBpointvar_mt, nvals, data) +- DB_OBJ_CASE(DB_POINTMESH, DBpointmesh_mt, ndims, coord) +- DB_OBJ_CASE(DB_CSGVAR, DBcsgvar_mt, nvals, vals) ++ DB_OBJ_CASE(DB_QUADVAR, DBquadvar_mt, nvals, value[i]) ++ /*DB_OBJ_CASE(DB_QUAD_RECT, DBquadmesh_mt, nspace, coord[i]) wont work for rect case */ ++ DB_OBJ_CASE(DB_QUAD_CURV, DBquadmesh_mt, nspace, coord[i]) ++ DB_OBJ_CASE(DB_QUADMESH, DBquadmesh_mt, nspace, coord[i]) ++ DB_OBJ_CASE(DB_UCDVAR, DBucdvar_mt, nvals, value[i]) ++ DB_OBJ_CASE(DB_UCDMESH, DBucdmesh_mt, ndims, coord[i]) ++ DB_OBJ_CASE(DB_POINTVAR, DBpointvar_mt, nvals, data[i]) ++ DB_OBJ_CASE(DB_POINTMESH, DBpointmesh_mt, ndims, coord[i]) ++ DB_OBJ_CASE(DB_CSGVAR, DBcsgvar_mt, nvals, vals[i]) + DB_OBJ_CASE(DB_CURVE, DBcurve_mt, npts?1:1, yvarname) + } + H5Tclose(o);