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

shtools: disable libtool, add 4.9.1, fix --test=root (#27014)

Browse Source 
The Makefile expects the "other" libtool, not the GNU libtool we have in Spack.
Closes https://github.com/spack/spack/issues/26993
Co-authored-by: Bernhard Kaindl <bernhardkaindl7@gmail.com>
This commit is contained in:
Erik Schnetter 2021-11-03 18:33:52 -04:00 committed by GitHub
parent c0a81399bf
commit 91a6e38404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/shtools/nolibtool.patch Normal file
View File

@ -0,0 +1,16 @@
--- a/src/Makefile
+++ b/src/Makefile
@@ -80,10 +80,10 @@
@echo "--> Compilation of source files successful"
@echo
@rm -f $(PROG)
- $(LIBTOOL) $(LIBTOOLFLAGS) -o $(PROG) $(OBJS)
+# $(LIBTOOL) $(LIBTOOLFLAGS) -o $(PROG) $(OBJS)
# If you prefer to use libtool, uncomment the above line, and comment the two lines below (AR and RLIB)
-# $(AR) $(ARFLAGS) $(PROG) $(OBJS)
-# $(RLIB) $(RLIBFLAGS) $(PROG)
+ $(AR) $(ARFLAGS) $(PROG) $(OBJS)
+ $(RLIB) $(RLIBFLAGS) $(PROG)
@echo
@echo "--> Creation of static library successful"
# @rm -f $(OBJS)

10
var/spack/repos/builtin/packages/shtools/package.py
View File

@ -14,6 +14,7 @@ class Shtools(MakefilePackage):
maintainers = ['eschnett']
version('4.9.1', sha256='5c22064f9daf6e9aa08cace182146993aa6b25a6ea593d92572c59f4013d53c2')
version('4.8', sha256='c36fc86810017e544abbfb12f8ddf6f101a1ac8b89856a76d7d9801ffc8dac44')
version('4.5', sha256='1975a2a2bcef8c527d321be08c13c2bc479e0d6b81c468a3203f95df59be4f89')
@ -21,11 +22,20 @@ class Shtools(MakefilePackage):
# install these properly yet, only the Fortran library is
# installed.
# The Makefile expects the "other" libtool, not the GNU libtool we have in
# Spack
patch('nolibtool.patch')
variant('openmp', default=True, description="Enable OpenMP support")
depends_on('blas')
depends_on('fftw')
depends_on('lapack')
depends_on('py-flake8', type='test')
def patch(self):
"""make check fix: Silence "do not use bare 'except'" in number of files"""
filter_file('ignore=', 'ignore=E722,', 'Makefile')
# Options for the Makefile
def makeopts(self, spec, prefix):