Lammps: don't apply AOCC patches to versions containing the backport (#39844)

Co-authored-by: Phil Tooley <phil.tooley@amd.com>
This commit is contained in:
AMD Toolchain Support 2023-09-19 07:52:15 +01:00 committed by GitHub
parent 9a9c3a984b
commit a0dcf9620b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -693,7 +693,12 @@ def url_for_version(self, version):
patch("lib.patch", when="@20170901") patch("lib.patch", when="@20170901")
patch("660.patch", when="@20170922") patch("660.patch", when="@20170922")
patch("gtest_fix.patch", when="@:20210310 %aocc@3.2.0") patch("gtest_fix.patch", when="@:20210310 %aocc@3.2.0")
patch("intel-aocc.patch", when="@20220324:20221103 +intel %aocc")
# This patch merged to LAMMPS trunk at 20221222 and backported to
# stable version 20220623.4. We still patch all other affected
# versions here
patch("intel-aocc.patch", when="@20220324:20220623.3,20220803:20221103 +intel %aocc")
patch( patch(
"https://github.com/lammps/lammps/commit/562300996285fdec4ef74542383276898555af06.patch?full_index=1", "https://github.com/lammps/lammps/commit/562300996285fdec4ef74542383276898555af06.patch?full_index=1",
sha256="e6f1b62bbfdc79d632f4cea98019202d0dd25aa4ae61a70df1164cb4f290df79", sha256="e6f1b62bbfdc79d632f4cea98019202d0dd25aa4ae61a70df1164cb4f290df79",