diff options
| author | Rémi Lacroix <remi.lacroix@idris.fr> | 2021-07-26 20:16:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 11:16:13 -0700 |
| commit | 43c135e3ce2feed8a3d3f6d9ce3f1d1887602b94 (patch) | |
| tree | 2ad42fa801f00f0613ca0a79cbb4205e4f684037 | |
| parent | 1c350854f8cf058acb8f5e504d110323e73763b3 (diff) | |
| download | spack-43c135e3ce2feed8a3d3f6d9ce3f1d1887602b94.tar.gz spack-43c135e3ce2feed8a3d3f6d9ce3f1d1887602b94.tar.bz2 spack-43c135e3ce2feed8a3d3f6d9ce3f1d1887602b94.tar.xz spack-43c135e3ce2feed8a3d3f6d9ce3f1d1887602b94.zip | |
n2p2 package: Add version 2.1.4 (#25031)
| -rw-r--r-- | var/spack/repos/builtin/packages/n2p2/libnnp-makefile212.patch | 30 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/n2p2/package.py | 9 |
2 files changed, 37 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/n2p2/libnnp-makefile212.patch b/var/spack/repos/builtin/packages/n2p2/libnnp-makefile212.patch new file mode 100644 index 0000000000..d48955d48f --- /dev/null +++ b/var/spack/repos/builtin/packages/n2p2/libnnp-makefile212.patch @@ -0,0 +1,30 @@ +--- a/src/libnnp/makefile ++++ b/src/libnnp/makefile +@@ -72,11 +72,11 @@ headers: version + + version: + @$(eval GIT_VERSION = $(shell git describe --tags --always)) +- @sed -i.bak -E "s/(N2P2_GIT_VERSION) .*/\1 \"$(GIT_VERSION)\"/" version.h ++ @sed -i.bak -E "s|(N2P2_GIT_VERSION) .*|\1 \"$(GIT_VERSION)\"|" version.h + @$(eval GIT_REV = $(shell git rev-parse HEAD)) +- @sed -i.bak -E "s/(N2P2_GIT_REV) .*/\1 \"$(GIT_REV)\"/" version.h ++ @sed -i.bak -E "s|(N2P2_GIT_REV) .*|\1 \"$(GIT_REV)\"|" version.h + @$(eval GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD)) +- @sed -i.bak -E "s/(N2P2_GIT_BRANCH) .*/\1 \"$(GIT_BRANCH)\"/" version.h ++ @sed -i.bak -E "s|(N2P2_GIT_BRANCH) .*|\1 \"$(GIT_BRANCH)\"|" version.h + @rm version.h.bak + + $(LIB).so: CFLAGS+= -fPIC +@@ -97,9 +97,9 @@ clean: clean-version clean-headers + $(RM) $(PROJECT_LIB)/$(LIB).so $(PROJECT_LIB)/$(LIB).a + + clean-version: +- @sed -i.bak -E "s/(N2P2_GIT_VERSION) .*/\1 \"\"/" version.h +- @sed -i.bak -E "s/(N2P2_GIT_REV) .*/\1 \"\"/" version.h +- @sed -i.bak -E "s/(N2P2_GIT_BRANCH) .*/\1 \"\"/" version.h ++ @sed -i.bak -E "s|(N2P2_GIT_VERSION) .*|\1 \"\"|" version.h ++ @sed -i.bak -E "s|(N2P2_GIT_REV) .*|\1 \"\"|" version.h ++ @sed -i.bak -E "s|(N2P2_GIT_BRANCH) .*|\1 \"\"|" version.h + @rm version.h.bak + + clean-headers: diff --git a/var/spack/repos/builtin/packages/n2p2/package.py b/var/spack/repos/builtin/packages/n2p2/package.py index 0d8ffda8e4..6fb12e5880 100644 --- a/var/spack/repos/builtin/packages/n2p2/package.py +++ b/var/spack/repos/builtin/packages/n2p2/package.py @@ -15,6 +15,10 @@ class N2p2(MakefilePackage): url = "https://github.com/CompPhysVienna/n2p2/archive/v2.1.0.tar.gz" version( + "2.1.4", + sha256="f1672c09af4ed16a7f396606977e4675a0fee98f04bfd9574907fba4b83a14ef", + ) + version( "2.1.1", sha256="90fbc0756132984d0d7e6d92d2f53358c120e75f148910d90c027158163251b9", ) @@ -26,8 +30,9 @@ class N2p2(MakefilePackage): variant("doc", default=False, description="build documentation with Doxygen") patch("interface-makefile.patch", when="@2.1.0") - patch("interface-makefile211.patch", when="@2.1.1") - patch("libnnp-makefile.patch") + patch("interface-makefile211.patch", when="@2.1.1:") + patch("libnnp-makefile.patch", when="@:2.1.1") + patch("libnnp-makefile212.patch", when="@2.1.2:") patch("nnp_test.h.patch") depends_on("mpi") |