From nobody Fri Jul 14 00:21:38 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 4R2Bwy6jWlz4nVGv; Fri, 14 Jul 2023 00:21:38 +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 4R2Bwy299gz4R17; Fri, 14 Jul 2023 00:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689294098; 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=em+yH8aTBs+COmkHoehZThunIse35VoVjtcZmQf+img=; b=l4v7KwpbBhGALSN747D0VGx6oS+/8Lp02nzIB4+usAwqw0ukoWVooaDZuX0GIgVfN1/un+ 0jyaNccJdHmA+xs5/maG8Z3uXwHSkl2MQxHiO1LHwIrdj1Vs/2SsTDT+vhUBpZ2j/J1Q7F Pw4/AYGgAjmr+j5j+U2lyXcB4RQ4/aF05tY3Wea3ITOutrObqoCY+4GMMxCbjiTH2/oaH1 dO30wRLzxatDNTnAiS1NClm7tEBO9JUobzu/KaFkEpS0prfBpHjtJVuXg9Ormlczvkaoar DjAL/wdOWpw586mpzwAdIlPrWWWYvs0H1K1kETI7cETxVMknlEe4Lvl7t8fzZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689294098; 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=em+yH8aTBs+COmkHoehZThunIse35VoVjtcZmQf+img=; b=X7V1JLkv7IrUbtyQxliNwmVTEV6o13IaA4CCmTsdKSzAgVPk1meNGdoVWG98lXor/KF6Jv qKL4jWlLqaktbNlgXgQx016etCY5A3PqeHApxhBgeoDpo+K2zfA1+rrBHyJGkkyA9Y4OqP DF5DtgYKXKausXhwj27QX6TZ7eN5gD8V3r+G08vR6eQGpW+BFqxMlrdgl9uwkrVJOPW2ay zR1edf2X8tyr4Qd3E7R6AxOP/tvknnRtfUb8FclmtdNn5+vbwIWtTP3z1+P5Ki00TmmChD TCBbMUn6T4ePl41DN1TZGyWm8swNA2bKkjUaT8OT5h1NIxEZaxNDA32W24S2TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689294098; a=rsa-sha256; cv=none; b=RKz6qOn/CUxNayXkxBB2oYMtk+UOd/BC/PVaX/QNnzzrcHM9GQ7Gt/nl39Y9ARleV/zCJv TSUCcuNqszts9A6ZG/OKj1UT9hccV8mXMQ+Ol4+Ee2wqUymWEdhTf0NphmiOj4aVekDoUj JBnZPP+PSzInZ8HKyVocg8yjhcuGyb16C+krPON3L7cUJptqHD+uiiLfunmD02YqpTfESW P7MT9yD58SiQYX0VvWJ1Os/OK4pNCx/33a+KxjTCnpPplMs5hONHStGxA/x1POM464GK4e a+pgTw78okv3QFRRJ8BUD/DISiY8XJe+OWRp89B9HN4+tBWLF8y4R7ly+wLnBQ== 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 4R2Bwy0cWjz1Bj5; Fri, 14 Jul 2023 00:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E0LctF099720; Fri, 14 Jul 2023 00:21:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E0Lcg0099719; Fri, 14 Jul 2023 00:21:38 GMT (envelope-from git) Date: Fri, 14 Jul 2023 00:21:38 GMT Message-Id: <202307140021.36E0Lcg0099719@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: 038e81ab5346 - main - science/gromacs: Fix tests 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: 038e81ab5346f6b11831ae76cda937d7c41811cd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=038e81ab5346f6b11831ae76cda937d7c41811cd commit 038e81ab5346f6b11831ae76cda937d7c41811cd Author: Yuri Victorovich AuthorDate: 2023-07-14 00:19:40 +0000 Commit: Yuri Victorovich CommitDate: 2023-07-14 00:21:33 +0000 science/gromacs: Fix tests ... by replacing the old bundled googletest with a newest release. --- science/gromacs/Makefile | 13 ++++++++++--- science/gromacs/distinfo | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile index cf150eb41fad..ce462cf73082 100644 --- a/science/gromacs/Makefile +++ b/science/gromacs/Makefile @@ -2,6 +2,7 @@ PORTNAME= gromacs DISTVERSION= 2023.2 CATEGORIES= science MASTER_SITES= ftp://ftp.gromacs.org/pub/gromacs/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # only for googletest MAINTAINER= yuri@FreeBSD.org COMMENT= Compute molecular dynamics @@ -14,12 +15,14 @@ BROKEN_i386= undefined reference to `__atomic_load' and `__atomic_compare_exchan BUILD_DEPENDS= boost-libs>=1.44:devel/boost-libs LIB_DEPENDS= libhwloc.so:devel/hwloc2 -TEST_DEPENDS= googletest>0:devel/googletest -USES= cmake compiler:c++17-lang fortran gnome perl5 pkgconfig python:build shebangfix xorg +USES= cmake compiler:c++17-lang gnome perl5 pkgconfig python:build shebangfix xorg USE_GNOME= libxml2 USE_LDCONFIG= yes +USE_GITHUB= nodefault +GH_TUPLE= google:googletest:v1.13.0:googletest + SHEBANG_FILES= admin/*.sh scripts/*.pl scripts/*.sh src/gromacs/selection/*.sh bash_CMD= ${SH} @@ -32,7 +35,7 @@ TEST_TARGET= check OPTIONS_DEFINE= ATLAS FLOAT LEGACY OPENCL OPENMP SIMD X11 OPTIONS_SINGLE= MP OPTIONS_SINGLE_MP= NOMP MPICH OPENMPI THREAD_MPI -OPTIONS_DEFAULT= LEGACY OPENMP THREAD_MPI X11 # FLOAT should not a default because science/votca needs double precision. This is likely the same for many other uses. +OPTIONS_DEFAULT= LEGACY OPENMP THREAD_MPI X11 # FLOAT should not be a default because science/votca needs double precision. This is likely the same for many other uses. OPTIONS_SUB= yes ATLAS_DESC= Use ATLAS for BLAS and LAPACK @@ -88,6 +91,10 @@ THREAD_MPI_DESC= Build a thread-MPI-based multithreaded version of GROMACS THREAD_MPI_CMAKE_BOOL= GMX_THREAD_MPI THREAD_MPI_PLIST_SUB= SUFFIX_MPI="" +post-extract: # replace outdated bundled googletest with a newer version to fix tests build, see https://gitlab.com/gromacs/gromacs/-/issues/4825 + @${RM} -r ${WRKSRC}/src/external/googletest + @${RLN} ${WRKSRC_googletest} ${WRKSRC}/src/external/googletest + post-patch: @${FIND} ${WRKSRC} -name "GMXRC.*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|LDLIB/pkgconfig|LDLIB/../libdata/pkgconfig| ; \ diff --git a/science/gromacs/distinfo b/science/gromacs/distinfo index 0cec71219d3a..1b7c30fa9b05 100644 --- a/science/gromacs/distinfo +++ b/science/gromacs/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1689223634 +TIMESTAMP = 1689290012 SHA256 (gromacs-2023.2.tar.gz) = bce1480727e4b2bb900413b75d99a3266f3507877da4f5b2d491df798f9fcdae SIZE (gromacs-2023.2.tar.gz) = 41930578 +SHA256 (google-googletest-v1.13.0_GH0.tar.gz) = ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363 +SIZE (google-googletest-v1.13.0_GH0.tar.gz) = 862871