summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-12-13 04:56:09 +0000
committerCoprDistGit <infra@openeuler.org>2024-12-13 04:56:09 +0000
commit16e646c1f25ed70d18997fbf0fe7d099f27215a6 (patch)
tree54114c7698913967e1962bb65452ac53be8fe087
parent47f7237bb8aa80ec2656c066483e8fad09895b51 (diff)
automatic import of lammps
-rw-r--r--.gitignore1
-rw-r--r--0-lammps-change-cmake-download.patch28
-rw-r--r--lammps.spec5
-rw-r--r--sources1
4 files changed, 34 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index bfe5fc0..bfb5048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/opencl-loader-2024.05.09.tar.gz
/spglib-1.11.2.1.tar.gz
/yaml-0.2.5.tar.gz
+/v2.4.0.tar.gz
diff --git a/0-lammps-change-cmake-download.patch b/0-lammps-change-cmake-download.patch
new file mode 100644
index 0000000..7e020dd
--- /dev/null
+++ b/0-lammps-change-cmake-download.patch
@@ -0,0 +1,28 @@
+From df0760a8b6216e53428958ed8b1ee7687e942a34 Mon Sep 17 00:00:00 2001
+From: zhtianyu <zhangtianyu@iscas.ac.cn>
+Date: Fri, 13 Dec 2024 12:48:51 +0800
+Subject: [PATCH] update
+
+---
+ cmake/Modules/Packages/KSPACE.cmake | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/Packages/KSPACE.cmake b/cmake/Modules/Packages/KSPACE.cmake
+index 3801140..7878d41 100644
+--- a/cmake/Modules/Packages/KSPACE.cmake
++++ b/cmake/Modules/Packages/KSPACE.cmake
+@@ -85,8 +85,9 @@ if(FFT_USE_HEFFTE)
+ set(Heffte_ENABLE_${FFT_HEFFTE_BACKEND} ON)
+ include(FetchContent)
+ FetchContent_Declare(HEFFTE_PROJECT # using v2.4.0
+- URL "https://github.com/icl-utk-edu/heffte/archive/refs/tags/v2.4.0.tar.gz"
+- URL_HASH SHA256=02310fb4f9688df02f7181667e61c3adb7e38baf79611d80919d47452ff7881d
++# URL "https://github.com/icl-utk-edu/heffte/archive/refs/tags/v2.4.0.tar.gz"
++# URL_HASH SHA256=02310fb4f9688df02f7181667e61c3adb7e38baf79611d80919d47452ff7881d
++ URL ${CMAKE_CURRENT_SOURCE_DIR}/heffte-2.4.0.tar.gz
+ )
+ FetchContent_Populate(HEFFTE_PROJECT)
+
+--
+2.47.1
+
diff --git a/lammps.spec b/lammps.spec
index ab2e7e3..fdc3a5d 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -34,6 +34,9 @@ Source1: https://github.com/google/googletest/archive/release-1.12.1.tar.
Source2: https://pyyaml.org/download/libyaml/yaml-0.2.5.tar.gz
Source3: https://download.lammps.org/thirdparty/opencl-loader-2024.05.09.tar.gz
Source4: https://github.com/spglib/spglib/archive/refs/tags/v1.11.2.1.tar.gz#/spglib-1.11.2.1.tar.gz
+Source5: https://github.com/icl-utk-edu/heffte/archive/refs/tags/v2.4.0.tar.gz
+
+Patch0: 0-lammps-change-cmake-download.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
# mpi is broken on s390x see, bug #2322073
@@ -213,6 +216,7 @@ BuildRequires: python3-build
%else
%setup -q -n %{name}-%{uversion}
%endif
+cp %{SOURCE5} cmake/
%build
set +e
@@ -370,6 +374,5 @@ done
%config %{_sysconfdir}/profile.d/lammps.*
%changelog
-
* Tue Dec 12 2024 zhtianyu <zhangtianyu@iscas.ac.cn> - 20241119-1
- Package init
diff --git a/sources b/sources
index c35aaf0..4b7a592 100644
--- a/sources
+++ b/sources
@@ -2,4 +2,5 @@ e82199374acdfda3f425331028eb4e2a googletest-1.12.1.tar.gz
a71f7054175aa4fa376122d2b93b753a lammps-patch_19Nov2024.tar.gz
e7796826b21c059224fabe997e0f2075 opencl-loader-2024.05.09.tar.gz
3089782bc85b5034dd4765a18ee70bc7 spglib-1.11.2.1.tar.gz
+b5328cba7096892eb2166f6878ff4ed8 v2.4.0.tar.gz
bb15429d8fb787e7d3f1c83ae129a999 yaml-0.2.5.tar.gz