diff --git a/components/__init__.py b/components/__init__.py index 0e6081b..74fd8ce 100644 --- a/components/__init__.py +++ b/components/__init__.py @@ -112,23 +112,6 @@ def define_mercury(reqs): 'make install'], libs=['opa'], package='openpa-devel' if inst(reqs, 'openpa') else None) - if ARM_PLATFORM: - url = "https://github.com/mercury-hpc/mchecksum.git" - retriever = GitRepoRetriever(url) - reqs.define('mchecksum', - retriever=retriever, - commands=['cmake -DBUILD_SHARED_LIBS=ON $MCHECKSUM_SRC' - '-DBUILD_TESTING=ON ' - '-DCMAKE_INSTALL_PREFIX=$MCHECKSUM_PREFIX ' - '-DMCHECKSUM_ENABLE_COVERAGE=OFF ' - '-DMCHECKSUM_ENABLE_VERBOSE_ERROR=ON ' - '-DMCHECKSUM_USE_ZLIB=OFF ' - '-DCMAKE_INSTALL_RPATH=$MCHECKSUM_PREFIX/lib ' - '-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE ', - 'make $JOBS_OPT', 'make install'], - libs=['mchecksum'], - out_of_src_build=True) - def define_common(reqs): """common system component definitions""" @@ -230,8 +213,6 @@ def define_pmix(reqs): package='ompi-devel' if inst(reqs, 'ompi') else None) - - def define_components(reqs): """Define all of the components""" define_common(reqs) @@ -245,8 +226,15 @@ def define_components(reqs): retriever=GitRepoRetriever( 'https://github.com/01org/isa-l.git'), commands=isal_build, - required_progs=['nasm', 'yasm'], libs=["isal"]) + reqs.define('isal_crypto', + retriever=GitRepoRetriever("https://github.com/intel/" + "isa-l_crypto"), + commands=['./autogen.sh ', + './configure --prefix=$ISAL_CRYPTO_PREFIX ' + '--libdir=$ISAL_CRYPTO_PREFIX/lib', + 'make $JOBS_OPT', 'make install'], + libs=['isal_crypto']) retriever = GitRepoRetriever("https://github.com/pmem/pmdk.git")