zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

n2p2 package: Add version 2.1.4 (#25031)

Browse Source
This commit is contained in:
Rémi Lacroix 2021-07-26 20:16:13 +02:00 committed by GitHub
parent 1c350854f8
commit 43c135e3ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
var/spack/repos/builtin/packages/n2p2/libnnp-makefile212.patch Normal file
View File

@ -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:

9
var/spack/repos/builtin/packages/n2p2/package.py
View File

@ -14,6 +14,10 @@ class N2p2(MakefilePackage):
homepage = "https://github.com/CompPhysVienna/n2p2"
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")