The package rpms/lammps.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/lammps.git/commit/?id=1f8a375f3bf...
https://src.fedoraproject.org/cgit/rpms/lammps.git/commit/?id=78eb2016109....
Change:
+%ifarch ppc64le
-%ifarch aarch64
Thanks.
Full change:
============
commit e12dfa7d64dd130d5e145e380e09abc9df03e84e
Author: Christoph Junghans <junghans(a)votca.org>
Date: Wed Apr 27 22:31:58 2022 -0600
exclude MolPairStyle:lj_cut_tip4p_long_soft test on ppc64le
diff --git a/lammps.spec b/lammps.spec
index e0d341e..92764df 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -244,7 +244,7 @@ done
%global testargs --label-exclude unstable
%ifarch ppc64le
-%global testargs --label-exclude unstable --exclude-regex
'MolPairStyle:lj_cut_tip4p_cut'
+%global testargs --label-exclude unstable --exclude-regex
'\(MolPairStyle:lj_cut_tip4p_cut\|MolPairStyle:lj_cut_tip4p_long_soft\)'
%endif
. /etc/profile.d/modules.sh
commit 1f8a375f3bfa4312470a6c6b264fd84485e8305e
Author: Christoph Junghans <junghans(a)votca.org>
Date: Wed Apr 27 17:15:10 2022 -0600
exclude MolPairStyle:lj_cut_tip4p_cut test on ppc64le
diff --git a/lammps.spec b/lammps.spec
index 60cbe09..e0d341e 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -243,6 +243,9 @@ done
%check
%global testargs --label-exclude unstable
+%ifarch ppc64le
+%global testargs --label-exclude unstable --exclude-regex
'MolPairStyle:lj_cut_tip4p_cut'
+%endif
. /etc/profile.d/modules.sh
for mpi in '' mpich openmpi %{?el7:openmpi3} ; do
commit 34fa75cd7c7719dc9a13ae2b43d8fa07e2a781bd
Author: Christoph Junghans <junghans(a)votca.org>
Date: Wed Apr 27 10:45:13 2022 -0600
update sources
diff --git a/.gitignore b/.gitignore
index ef38b3f..06f7b0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/googletest-*.tar.gz
/opencl-loader-2021.09.18.tar.gz
/yaml-0.2.5.tar.gz
+/opencl-loader-2022.01.04.tar.gz
diff --git a/sources b/sources
index 10516bd..e762a0f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (opencl-loader-2021.09.18.tar.gz) =
92e11dbca4c3bfaa27339e8864d5227c33230c0364bd00c832a7978a6121bbe136c107755a1225fa15810ea6bfb931f533f30365ff563ef52be0e08f5601ffab
+SHA512 (opencl-loader-2022.01.04.tar.gz) =
cfedca22d06e547b5621eebd9a9c112ba923bd940c0e46723cf2e0a139a50bf8080c28481435b011f20e72c525e793b51d38679ebb1656375e3c14c20301d2e8
SHA512 (yaml-0.2.5.tar.gz) =
dadd7d8e0d88b5ebab005e5d521d56d541580198aa497370966b98c904586e642a1cd4f3881094eb57624f218d50db77417bbfd0ffdce50340f011e35e8c4c02
-SHA512 (release-1.10.0.tar.gz) =
bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9
-SHA512 (lammps-stable_29Sep2021_update2.tar.gz) =
8465a51689c1904b296ca939b10fcbc9e46ca9c9feb0e457b004896782cfe8ad90bb4db329bc2c5831df650add09289e4cd8b213f803ba204621be4851129953
+SHA512 (googletest-43efa0a4efd40c78b9210d15373112081899a97c.tar.gz) =
790f441ee7926410ef3d1bbe179d15184bf423478019c4b43c1e9ae63dc8081076d884498d6adf24e65c9be348f335a00627b4ce3bb5d9b9f3802e33f4dbfba2
+SHA512 (lammps-patch_17Feb2022.tar.gz) =
c2b643b9fc17c9ddac102a5ef5d8630aa22755d4f2c21a7eea2fc00223263f10de098f69cd40f22669e1a135679753740704d776c71a3d7776b5f8e34b628d6c
commit 2816bc7a700c76f6acfb0ae2f813558616f58733
Author: Christoph Junghans <junghans(a)votca.org>
Date: Wed Apr 27 10:33:46 2022 -0600
Rebuild for kokkos-3.6
diff --git a/lammps.spec b/lammps.spec
index 6f8c211..60cbe09 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -26,7 +26,7 @@ Version: 20220217
m=${v:4:2};
y=${v:0:4};
echo $([[ -z $patch ]] && echo patch || echo
stable)_${d#0}${months[${m#0}]}${y}$([[ -n $patch ]] && echo _update${patch}))
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Molecular Dynamics Simulator
License: GPLv2
Url:
https://www.lammps.org/
@@ -323,6 +323,9 @@ done
%config %{_sysconfdir}/profile.d/lammps.*
%changelog
+* Wed Apr 27 2022 Christoph Junghans <junghans(a)votca.org> - 20220217-2
+- Rebuild for kokkos-3.6
+
* Fri Feb 18 2022 Richard Berger <richard.berger(a)outlook.com> - 20220217-1
- Version bump to 20220217
commit 78eb20161094ef3c6a02bb6e6b812226116aebdb
Author: Richard Berger <richard.berger(a)outlook.com>
Date: Fri Feb 18 12:14:26 2022 -0500
Version bump to 20220217
diff --git a/lammps.spec b/lammps.spec
index 02b0a18..6f8c211 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -1,5 +1,5 @@
%global git 0
-%global commit 7fe194e59ed80bd4840ccbdfac79e2df31e53491
+%global commit 01bbb28418ea3f16acd8413152c3b273e3edb70c
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global gtest_commit 43efa0a4efd40c78b9210d15373112081899a97c
@@ -14,9 +14,9 @@
Name: lammps
%if %{git}
-Version: 20220107^%{shortcommit}
+Version: 20220217^%{shortcommit}
%else
-Version: 20210929.2
+Version: 20220217
%endif
%global uversion %(v=%{version}; \
patch=${v##*.}; [[ $v = $patch ]] && patch= \
@@ -26,7 +26,7 @@ Version: 20210929.2
m=${v:4:2};
y=${v:0:4};
echo $([[ -z $patch ]] && echo patch || echo
stable)_${d#0}${months[${m#0}]}${y}$([[ -n $patch ]] && echo _update${patch}))
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Molecular Dynamics Simulator
License: GPLv2
Url:
https://www.lammps.org/
@@ -242,27 +242,7 @@ done
%check
-%if %{git}
%global testargs --label-exclude unstable
-%else
-#
https://github.com/lammps/lammps/issues/3080
-# replace this by --label-exclude unstable in the next major release
-%ifarch ppc64le
-%global testargs --exclude-regex
'\(MolPairStyle:hybrid-scaled\|AtomicPairStyle:buck_coul_cut_qeq_point\|AtomicPairStyle:buck_coul_cut_qeq_shielded\|AtomicPairStyle:edip\|AtomicPairStyle:kim_lj\|AtomicPairStyle:meam_sw_spline\|AtomicPairStyle:reaxff\|AtomicPairStyle:reaxff_lgvdw\|AtomicPairStyle:reaxff_noqeq\|AtomicPairStyle:reaxff_tabulate\|ManybodyPairStyle:bop_save\|ManybodyPairStyle:drip\|ManybodyPairStyle:drip_real\|ManybodyPairStyle:ilp-graphene-hbn\|ManybodyPairStyle:ilp-graphene-hbn_notaper\|ManybodyPairStyle:kolmogorov_crespi_full\|ManybodyPairStyle:lebedeva_z\|ManybodyPairStyle:mliap_so3\|ManybodyPairStyle:rann\|FixTimestep:momentum\|DihedralStyle:quadratic\|DihedralStyle:table_cut_linear\|DihedralStyle:table_linear\|MolPairStyle:lj_cut_tip4p_long_soft\|MolPairStyle:tip4p_table\|MolPairStyle:tip4p_cut\|MolPairStyle:tip4p_long\|MolPairStyle:lj_cut_tip4p_cut\|MolPairStyle:lj_cut_tip4p_table\)'
-%endif
-%ifarch %ix86
-%global testargs --exclude-regex MolPairStyle:lj_long_tip4p_long
-%endif
-%ifarch %arm
-%global testargs --exclude-regex
'\(MolPairStyle:hybrid-scaled\|AtomicPairStyle:buck_coul_cut_qeq_point\|AtomicPairStyle:buck_coul_cut_qeq_shielded\|AtomicPairStyle:edip\|AtomicPairStyle:meam_sw_spline\|AtomicPairStyle:reaxff\|AtomicPairStyle:reaxff_lgvdw\|AtomicPairStyle:reaxff_noqeq\|AtomicPairStyle:reaxff_tabulate\)'
-%endif
-%ifarch s390x
-%global testargs --exclude-regex
'\(MolPairStyle:buck_table_coul_off\|MolPairStyle:lj_table_coul_off\|MolPairStyle:soft\|AtomicPairStyle:buck_coul_cut_qeq_point\|AtomicPairStyle:buck_coul_cut_qeq_shielded\|AtomicPairStyle:edip\|AtomicPairStyle:kim_lj\|AtomicPairStyle:meam_sw_spline\|AtomicPairStyle:reaxff\|AtomicPairStyle:reaxff_lgvdw\|AtomicPairStyle:reaxff_noqeq\|AtomicPairStyle:reaxff_tabulate\|ManybodyPairStyle:bop_save\|ManybodyPairStyle:drip\|ManybodyPairStyle:drip_real\|ManybodyPairStyle:ilp-graphene-hbn\|ManybodyPairStyle:ilp-graphene-hbn_notaper\|ManybodyPairStyle:kolmogorov_crespi_full\|ManybodyPairStyle:lebedeva_z\|ManybodyPairStyle:meam\|ManybodyPairStyle:mliap_so3\|ManybodyPairStyle:rann\|FixTimestep:momentum\|DihedralStyle:quadratic\|DihedralStyle:table_cut_linear\|DihedralStyle:table_linear\)'
-%endif
-%ifarch aarch64
-%global testargs --exclude-regex
'\(MolPairStyle:hybrid-scaled\|AtomicPairStyle:buck_coul_cut_qeq_point\|AtomicPairStyle:buck_coul_cut_qeq_shielded\|AtomicPairStyle:edip\|AtomicPairStyle:kim_lj\|AtomicPairStyle:meam_sw_spline\|AtomicPairStyle:reaxff\|AtomicPairStyle:reaxff_lgvdw\|AtomicPairStyle:reaxff_noqeq\|AtomicPairStyle:reaxff_tabulate\|ManybodyPairStyle:bop_save\|ManybodyPairStyle:drip\|ManybodyPairStyle:drip_real\|ManybodyPairStyle:ilp-graphene-hbn\|ManybodyPairStyle:ilp-graphene-hbn_notaper\|ManybodyPairStyle:kolmogorov_crespi_full\|ManybodyPairStyle:lebedeva_z\|ManybodyPairStyle:mliap_so3\|ManybodyPairStyle:rann\|FixTimestep:momentum\|FixTimestep:rigid_nph_small\|DihedralStyle:quadratic\|DihedralStyle:table_cut_linear\|DihedralStyle:table_linear\|MolPairStyle:lj_cut_tip4p_cut\|MolPairStyle:lj_cut_tip4p_long\)'
-%endif
-%endif
. /etc/profile.d/modules.sh
for mpi in '' mpich openmpi %{?el7:openmpi3} ; do
@@ -343,6 +323,9 @@ done
%config %{_sysconfdir}/profile.d/lammps.*
%changelog
+* Fri Feb 18 2022 Richard Berger <richard.berger(a)outlook.com> - 20220217-1
+- Version bump to 20220217
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
20210929.2-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
commit bb112b0d0150b7c6ddc6ef171b92b371ff683e5c
Author: Richard Berger <richard.berger(a)outlook.com>
Date: Thu Feb 17 13:55:44 2022 -0500
Update testing commit
diff --git a/lammps.spec b/lammps.spec
index de4ce6b..02b0a18 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -1,5 +1,5 @@
%global git 0
-%global commit 6d2f4343d9f4f19d05661e86795e0aae19c4e054
+%global commit 7fe194e59ed80bd4840ccbdfac79e2df31e53491
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global gtest_commit 43efa0a4efd40c78b9210d15373112081899a97c
commit 6f7338321720f61986c39943cf0c796b64ca59fa
Author: Richard Berger <richard.berger(a)outlook.com>
Date: Wed Feb 16 10:42:45 2022 -0500
Update testing commit
diff --git a/lammps.spec b/lammps.spec
index 9c59067..de4ce6b 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -1,5 +1,5 @@
%global git 0
-%global commit 618b3ec94f35cdcb1f1430074c8ac3ea1a85dcb8
+%global commit 6d2f4343d9f4f19d05661e86795e0aae19c4e054
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global gtest_commit 43efa0a4efd40c78b9210d15373112081899a97c
commit ab9000b2437e46072a138f3b72457f53972c60bf
Author: Richard Berger <richard.berger(a)outlook.com>
Date: Mon Feb 14 19:32:12 2022 -0500
Update OpenCL loader tarball and testing commit
diff --git a/lammps.spec b/lammps.spec
index fa05db5..9c59067 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -1,5 +1,5 @@
%global git 0
-%global commit 81587527fe2c613168d2af76f21aa3c406d41c66
+%global commit 618b3ec94f35cdcb1f1430074c8ac3ea1a85dcb8
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global gtest_commit 43efa0a4efd40c78b9210d15373112081899a97c
@@ -37,7 +37,7 @@ Source0:
https://github.com/lammps/lammps/archive/%{uversion}.tar.gz#/%{n
%endif
Source1:
https://github.com/google/googletest/archive/%{gtest_commit}.tar.gz#/goog...
Source2:
https://pyyaml.org/download/libyaml/yaml-0.2.5.tar.gz
-Source3:
https://download.lammps.org/thirdparty/opencl-loader-2021.09.18.tar.gz
+Source3:
https://download.lammps.org/thirdparty/opencl-loader-2022.01.04.tar.gz
BuildRequires: fftw-devel
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
commit 56026d7be426990416bab669f67f3b4c91f30f50
Author: Richard Berger <richard.berger(a)outlook.com>
Date: Mon Feb 14 13:33:26 2022 -0500
Update testing commit
diff --git a/lammps.spec b/lammps.spec
index e84184c..fa05db5 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -1,5 +1,5 @@
%global git 0
-%global commit ce83ca1efdd376f352b0ba2ed68a8a4a9f0913b3
+%global commit 81587527fe2c613168d2af76f21aa3c406d41c66
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global gtest_commit 43efa0a4efd40c78b9210d15373112081899a97c
commit 4cc56455cd00da5cc57320b749762df3c6a808c3
Author: Richard Berger <richard.berger(a)outlook.com>
Date: Wed Feb 9 17:30:17 2022 -0500
Filter ctests with unstable label
diff --git a/lammps.spec b/lammps.spec
index 332c767..e84184c 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -242,6 +242,9 @@ done
%check
+%if %{git}
+%global testargs --label-exclude unstable
+%else
#
https://github.com/lammps/lammps/issues/3080
# replace this by --label-exclude unstable in the next major release
%ifarch ppc64le
@@ -259,6 +262,7 @@ done
%ifarch aarch64
%global testargs --exclude-regex
'\(MolPairStyle:hybrid-scaled\|AtomicPairStyle:buck_coul_cut_qeq_point\|AtomicPairStyle:buck_coul_cut_qeq_shielded\|AtomicPairStyle:edip\|AtomicPairStyle:kim_lj\|AtomicPairStyle:meam_sw_spline\|AtomicPairStyle:reaxff\|AtomicPairStyle:reaxff_lgvdw\|AtomicPairStyle:reaxff_noqeq\|AtomicPairStyle:reaxff_tabulate\|ManybodyPairStyle:bop_save\|ManybodyPairStyle:drip\|ManybodyPairStyle:drip_real\|ManybodyPairStyle:ilp-graphene-hbn\|ManybodyPairStyle:ilp-graphene-hbn_notaper\|ManybodyPairStyle:kolmogorov_crespi_full\|ManybodyPairStyle:lebedeva_z\|ManybodyPairStyle:mliap_so3\|ManybodyPairStyle:rann\|FixTimestep:momentum\|FixTimestep:rigid_nph_small\|DihedralStyle:quadratic\|DihedralStyle:table_cut_linear\|DihedralStyle:table_linear\|MolPairStyle:lj_cut_tip4p_cut\|MolPairStyle:lj_cut_tip4p_long\)'
%endif
+%endif
. /etc/profile.d/modules.sh
for mpi in '' mpich openmpi %{?el7:openmpi3} ; do
commit 28035fbb353cd94d060b43c4e14a972552ca53d2
Author: Richard Berger <richard.berger(a)outlook.com>
Date: Wed Feb 9 16:07:20 2022 -0500
Add global git to allow builds on newer commits
diff --git a/lammps.spec b/lammps.spec
index 2c3f1af..332c767 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -1,3 +1,6 @@
+%global git 0
+%global commit ce83ca1efdd376f352b0ba2ed68a8a4a9f0913b3
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global gtest_commit 43efa0a4efd40c78b9210d15373112081899a97c
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
@@ -10,7 +13,11 @@
%endif
Name: lammps
+%if %{git}
+Version: 20220107^%{shortcommit}
+%else
Version: 20210929.2
+%endif
%global uversion %(v=%{version}; \
patch=${v##*.}; [[ $v = $patch ]] && patch= \
v=${v%%.*}; \
@@ -23,7 +30,11 @@ Release: 2%{?dist}
Summary: Molecular Dynamics Simulator
License: GPLv2
Url:
https://www.lammps.org/
+%if %{git}
+Source0:
https://github.com/lammps/lammps/archive/%{commit}/lammps-%{commit}.tar.g...
+%else
Source0:
https://github.com/lammps/lammps/archive/%{uversion}.tar.gz#/%{name}-%{uv...
+%endif
Source1:
https://github.com/google/googletest/archive/%{gtest_commit}.tar.gz#/goog...
Source2:
https://pyyaml.org/download/libyaml/yaml-0.2.5.tar.gz
Source3:
https://download.lammps.org/thirdparty/opencl-loader-2021.09.18.tar.gz
@@ -179,7 +190,11 @@ BuildArch: noarch
This package contains data files for LAMMPS.
%prep
+%if %{git}
+%setup -q -n %{name}-%{commit}
+%else
%setup -q -n %{name}-%{uversion}
+%endif
%build
%global _vpath_srcdir cmake
commit 7c321911248ee9a7667139da898febcb3ef8e5d3
Author: Richard Berger <richard.berger(a)outlook.com>
Date: Wed Feb 9 16:05:59 2022 -0500
Simplify .gitignore
diff --git a/.gitignore b/.gitignore
index 63106cc..ef38b3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,5 @@
/lammps-*.src.rpm
-/lammps-patch_11Aug2017.tar.gz
-/lammps-patch_1Sep2017.tar.gz
-/lammps-patch_23Oct2017.tar.gz
-/lammps-patch_17Jan2018.tar.gz
-/lammps-patch_22Feb2018.tar.gz
-/lammps-patch_8Mar2018.tar.gz
-/lammps-stable_16Mar2018.tar.gz
-/lammps-stable_22Aug2018.tar.gz
-/lammps-stable_12Dec2018.tar.gz
-/lammps-testing-7869c75cac38cb8a3d2ef7747ea12ec5812f5151.tar.gz
-/lammps-stable_5Jun2019.tar.gz
-/lammps-testing-827be7af84ca100d394ea1cf6d3bc49f6a8eef92.tar.gz
-/lammps-stable_7Aug2019.tar.gz
-/lammps-testing-d0394a77fa2b4b2d545a73ea092cf6de7616aac8.tar.gz
-/lammps-stable_3Mar2020.tar.gz
-/lammps-testing-e6a3a1989c0c2629c85ebef115bf3258a6347f48.tar.gz
-/lammps-testing-stable_3Mar2020.tar.gz
-/lammps-patch_5May2020.tar.gz
-/lammps-testing-patch_5May2020.tar.gz
-/lammps-patch_30Jun2020.tar.gz
-/release-1.10.0.tar.gz
-/lammps-patch_21Aug2020.tar.gz
-/lammps-patch_18Sep2020.tar.gz
-/lammps-patch_29Oct2020.tar.gz
+/lammps-*.tar.gz
+/googletest-*.tar.gz
/opencl-loader-2021.09.18.tar.gz
/yaml-0.2.5.tar.gz
-/lammps-patch_29Sep2021.tar.gz
-/lammps-stable_29Sep2021_update1.tar.gz
-/lammps-stable_29Sep2021_update2.tar.gz
commit 3f84862aac2a4c26f33a58fb05b123e0669a9493
Author: Richard Berger <richard.berger(a)outlook.com>
Date: Wed Feb 9 16:05:19 2022 -0500
Remove gtest_gcc12.patch and use newer GTest instead
diff --git a/gtest_gcc12.patch b/gtest_gcc12.patch
deleted file mode 100644
index e2cd982..0000000
--- a/gtest_gcc12.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur lammps-patch_29Sep2021.orig/cmake/Modules/GTest.cmake
lammps-patch_29Sep2021/cmake/Modules/GTest.cmake
---- lammps-patch_29Sep2021.orig/cmake/Modules/GTest.cmake 2022-02-01 17:24:24.648202705
-0700
-+++ lammps-patch_29Sep2021/cmake/Modules/GTest.cmake 2022-02-01 17:24:04.363665231 -0700
-@@ -26,6 +26,7 @@
-
<BINARY_DIR>/lib/libgmock${GTEST_LIB_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
-
<BINARY_DIR>/lib/libgtest_main${GTEST_LIB_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
-
<BINARY_DIR>/lib/libgmock_main${GTEST_LIB_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
-+ PATCH_COMMAND patch -p1
<${CMAKE_SOURCE_DIR}/f7902802f1a61140e188223fb6d1c95925cbec4a.patch
- LOG_DOWNLOAD ON
- LOG_CONFIGURE ON
- LOG_BUILD ON
-diff -Naur lammps-patch_29Sep2021.orig/f7902802f1a61140e188223fb6d1c95925cbec4a.patch
lammps-patch_29Sep2021/f7902802f1a61140e188223fb6d1c95925cbec4a.patch
---- lammps-patch_29Sep2021.orig/f7902802f1a61140e188223fb6d1c95925cbec4a.patch 1969-12-31
17:00:00.000000000 -0700
-+++ lammps-patch_29Sep2021/f7902802f1a61140e188223fb6d1c95925cbec4a.patch 2022-02-01
17:24:41.084827921 -0700
-@@ -0,0 +1,41 @@
-+From f7902802f1a61140e188223fb6d1c95925cbec4a Mon Sep 17 00:00:00 2001
-+From: dmauro <dmauro(a)google.com>
-+Date: Fri, 18 Jun 2021 19:32:08 +0000
-+Subject: [PATCH] Googletest export
-+
-+Remove -Werror from the CMake compiler flags
-+
-+We should not force warnings as errors on users.
-+Sometimes compilers introduce new warnings which
-+will break builds.
-+
-+Instead, we manually turn this flag on in our continuous integration
-+scripts so we can catch these errors, but not force them on our users.
-+
-+Fixes #3447
-+
-+PiperOrigin-RevId: 380241852
-+---
-+ googletest/cmake/internal_utils.cmake | 4 ++--
-+ 1 file changed, 2 insertions(+), 2 deletions(-)
-+
-+diff --git a/googletest/cmake/internal_utils.cmake
b/googletest/cmake/internal_utils.cmake
-+index 8d8d60a86c..58fc9bfbee 100644
-+--- a/googletest/cmake/internal_utils.cmake
-++++ b/googletest/cmake/internal_utils.cmake
-+@@ -84,13 +84,13 @@ macro(config_compiler_and_linker)
-+ # Ensure MSVC treats source files as UTF-8 encoded.
-+ set(cxx_base_flags "${cxx_base_flags} -utf-8")
-+ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-+- set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
-++ set(cxx_base_flags "-Wall -Wshadow -Wconversion")
-+ set(cxx_exception_flags "-fexceptions")
-+ set(cxx_no_exception_flags "-fno-exceptions")
-+ set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual
-Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline
-Wredundant-decls")
-+ set(cxx_no_rtti_flags "-fno-rtti")
-+ elseif (CMAKE_COMPILER_IS_GNUCXX)
-+- set(cxx_base_flags "-Wall -Wshadow -Werror")
-++ set(cxx_base_flags "-Wall -Wshadow")
-+ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
-+ set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
-+ endif()
diff --git a/lammps.spec b/lammps.spec
index 11d94a8..2c3f1af 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -1,3 +1,5 @@
+%global gtest_commit 43efa0a4efd40c78b9210d15373112081899a97c
+
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
%global blaslib flexiblas
%global cmake_blas_flags -DBLA_VENDOR=FlexiBLAS
@@ -22,10 +24,9 @@ Summary: Molecular Dynamics Simulator
License: GPLv2
Url:
https://www.lammps.org/
Source0:
https://github.com/lammps/lammps/archive/%{uversion}.tar.gz#/%{name}-%{uv...
-Source1:
https://github.com/google/googletest/archive/release-1.10.0.tar.gz
+Source1:
https://github.com/google/googletest/archive/%{gtest_commit}.tar.gz#/goog...
Source2:
https://pyyaml.org/download/libyaml/yaml-0.2.5.tar.gz
Source3:
https://download.lammps.org/thirdparty/opencl-loader-2021.09.18.tar.gz
-Patch0: gtest_gcc12.patch
BuildRequires: fftw-devel
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
@@ -179,8 +180,6 @@ This package contains data files for LAMMPS.
%prep
%setup -q -n %{name}-%{uversion}
-%patch0 -p1
-sed -i -e '/LOG_CONFIGURE/d' -e '/LOG_BUILD/d' cmake/Modules/GTest.cmake
%build
%global _vpath_srcdir cmake
@@ -202,9 +201,9 @@ for mpi in '' mpich openmpi %{?el7:openmpi3} ; do
%{?with_kokkos:-DPKG_KOKKOS=ON -DEXTERNAL_KOKKOS=ON} \
-DPKG_KIM=ON \
-DENABLE_TESTING=ON \
- -DGTEST_URL=%{S:1} \
- -DYAML_URL=%{S:2} \
- -DOPENCL_LOADER_URL=%{S:3} \
+ -DGTEST_URL=file://%{S:1} \
+ -DYAML_URL=file://%{S:2} \
+ -DOPENCL_LOADER_URL=file://%{S:3} \
-DPYTHON_INSTDIR=%{python3_sitelib} \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DPKG_GPU=ON -DGPU_API=OpenCL \