Commit f183b7e4 authored by Marc Vef's avatar Marc Vef
Browse files

More mogon3 fixes

parent 16fd128b

scripts/profiles/0.9.3/install/mercury.install

+5 −3
Original line number Diff line number Diff line
@@ -54,9 +54,11 @@ pkg_install() { 


    # if the profile provides any flavour of libfabric, enable it

    if profile_has_dependency "^libfabric.*$"; then

        USE_OFI="-DNA_USE_OFI:BOOL=ON"

        OFI_ARGS="-DNA_USE_OFI:BOOL=ON"

    elif [[ -n "${EXTRA_INSTALL_ARGS}" ]]; then

        OFI_ARGS="${EXTRA_INSTALL_ARGS}"

    else

        USE_OFI="-DNA_USE_OFI:BOOL=OFF"

        OFI_ARGS="-DNA_USE_OFI:BOOL=OFF"

    fi



    ID="mercury"
@@ -71,7 +73,7 @@ pkg_install() { 
        -DMERCURY_USE_BOOST_PP:BOOL=ON \

        -DBUILD_SHARED_LIBS:BOOL=ON \

        -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \

        ${USE_BMI} ${USE_OFI} \

        ${USE_BMI} ${OFI_ARGS} \

        ..

    make -j"${CORES}"

    make install

scripts/profiles/0.9.3/mogon3.specs

+1 −0
Original line number Diff line number Diff line
@@ -79,4 +79,5 @@ order=( 
#  - PERFORM_TEST: whether tests for the package should be executed

extra_install_args=(

#    ["libfabric"]=""

    ["mercury"]="-DNA_USE_OFI:BOOL=ON"

)

src/common/msgpack_util.cpp

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <config.hpp>



extern "C" {

#include <unistd.h>

#include <fcntl.h>

}