CMake: fix rhash detection (#27944)
* RHash: update version; create symlink librash.so * Install headers * Flake-8 * Update package.py * Update package.py * Update package.py (#19) * Update package.py * Update package.py * Update var/spack/repos/builtin/packages/rhash/package.py Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * Fix installation on macOS Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
This commit is contained in:
parent
556565ca0d
commit
6443086222
@ -3,6 +3,8 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
||||||
|
|
||||||
|
import os
|
||||||
|
|
||||||
|
|
||||||
class Rhash(MakefilePackage):
|
class Rhash(MakefilePackage):
|
||||||
"""RHash is a console utility for computing and verifying hash sums of
|
"""RHash is a console utility for computing and verifying hash sums of
|
||||||
@ -13,11 +15,18 @@ class Rhash(MakefilePackage):
|
|||||||
homepage = "https://sourceforge.net/projects/rhash/"
|
homepage = "https://sourceforge.net/projects/rhash/"
|
||||||
url = "https://github.com/rhash/RHash/archive/v1.3.5.tar.gz"
|
url = "https://github.com/rhash/RHash/archive/v1.3.5.tar.gz"
|
||||||
|
|
||||||
|
version('1.4.2', sha256='600d00f5f91ef04194d50903d3c79412099328c42f28ff43a0bdb777b00bec62')
|
||||||
version('1.3.5', sha256='98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e')
|
version('1.3.5', sha256='98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e')
|
||||||
|
|
||||||
|
# configure: fix clang detection on macOS
|
||||||
|
# Patch accepted and merged upstream, remove on next release
|
||||||
|
patch('https://github.com/rhash/RHash/commit/4dc506066cf1727b021e6352535a8bb315c3f8dc.patch?full_index=1',
|
||||||
|
when='@1.4.2', sha256='3fbfe4603d2ec5228fd198fc87ff3ee281e1f68d252c1afceaa15cba76e9b6b4')
|
||||||
|
|
||||||
# For macOS build instructions, see:
|
# For macOS build instructions, see:
|
||||||
# https://github.com/Homebrew/homebrew-core/blob/master/Formula/rhash.rb
|
# https://github.com/Homebrew/homebrew-core/blob/master/Formula/rhash.rb
|
||||||
|
|
||||||
|
@when('@:1.3.5')
|
||||||
def build(self, spec, prefix):
|
def build(self, spec, prefix):
|
||||||
# Doesn't build shared libraries by default
|
# Doesn't build shared libraries by default
|
||||||
make('PREFIX={0}'.format(prefix))
|
make('PREFIX={0}'.format(prefix))
|
||||||
@ -27,6 +36,11 @@ def build(self, spec, prefix):
|
|||||||
else:
|
else:
|
||||||
make('PREFIX={0}'.format(prefix), 'lib-shared')
|
make('PREFIX={0}'.format(prefix), 'lib-shared')
|
||||||
|
|
||||||
|
@when('@1.3.6:')
|
||||||
|
def build(self, spec, prefix):
|
||||||
|
configure('--prefix=')
|
||||||
|
make()
|
||||||
|
|
||||||
def check(self):
|
def check(self):
|
||||||
# Makefile has both `test` and `check` targets:
|
# Makefile has both `test` and `check` targets:
|
||||||
#
|
#
|
||||||
@ -36,12 +50,19 @@ def check(self):
|
|||||||
# Default implmentation is to run both `make test` and `make check`.
|
# Default implmentation is to run both `make test` and `make check`.
|
||||||
# `test` passes, but `check` fails, so only run `test`.
|
# `test` passes, but `check` fails, so only run `test`.
|
||||||
make('test')
|
make('test')
|
||||||
make('test-static-lib')
|
if self.spec.satisfies('@:1.3.5'):
|
||||||
|
make('test-static-lib')
|
||||||
|
else:
|
||||||
|
make('test-lib-static')
|
||||||
|
|
||||||
if not self.spec.satisfies('platform=darwin'):
|
if not self.spec.satisfies('@:1.3.5 platform=darwin'):
|
||||||
make('test-shared')
|
make('test-shared')
|
||||||
make('test-shared-lib')
|
if self.spec.satisfies('@:1.3.5'):
|
||||||
|
make('test-shared-lib')
|
||||||
|
else:
|
||||||
|
make('test-lib-shared')
|
||||||
|
|
||||||
|
@when('@:1.3.5')
|
||||||
def install(self, spec, prefix):
|
def install(self, spec, prefix):
|
||||||
# Some things are installed to $(DESTDIR)$(PREFIX) while other things
|
# Some things are installed to $(DESTDIR)$(PREFIX) while other things
|
||||||
# are installed to $DESTDIR/etc.
|
# are installed to $DESTDIR/etc.
|
||||||
@ -52,3 +73,25 @@ def install(self, spec, prefix):
|
|||||||
install('librhash/*.dylib', prefix.lib)
|
install('librhash/*.dylib', prefix.lib)
|
||||||
else:
|
else:
|
||||||
make('install-lib-shared', 'DESTDIR={0}'.format(prefix), 'PREFIX=')
|
make('install-lib-shared', 'DESTDIR={0}'.format(prefix), 'PREFIX=')
|
||||||
|
os.symlink(join_path(prefix.lib, 'librhash.so.0'),
|
||||||
|
join_path(prefix.lib, 'librhash.so'))
|
||||||
|
|
||||||
|
@when('@1.3.6:')
|
||||||
|
def install(self, spec, prefix):
|
||||||
|
# Intermittent issues during installation, prefix.bin directory already exists
|
||||||
|
make('install', 'DESTDIR={0}'.format(prefix), parallel=False)
|
||||||
|
make('install-pkg-config', 'DESTDIR={0}'.format(prefix))
|
||||||
|
make('install-lib-so-link', 'DESTDIR={0}'.format(prefix))
|
||||||
|
make('install-lib-headers', 'DESTDIR={0}'.format(prefix))
|
||||||
|
|
||||||
|
@run_after('install')
|
||||||
|
def darwin_fix(self):
|
||||||
|
# The shared library is not installed correctly on Darwin; fix this
|
||||||
|
if self.spec.satisfies('@1.3.6: platform=darwin'):
|
||||||
|
# Fix RPATH for <prefix>/bin/rhash
|
||||||
|
old = '/lib/librhash.0.dylib'
|
||||||
|
new = self.prefix.lib.join('librhash.dylib')
|
||||||
|
install_name_tool = Executable('install_name_tool')
|
||||||
|
install_name_tool('-change', old, new, self.prefix.bin.rhash)
|
||||||
|
# Fix RPATH for <prefix>/lib/librhash.dylib
|
||||||
|
fix_darwin_install_name(self.prefix.lib)
|
||||||
|
Loading…
Reference in New Issue
Block a user