Commit 318e5c76 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'jathenst/286-pkg_config_path-not-propagated-to-dependency-scripts' into 'master' 

Resolve "PKG_CONFIG_PATH not propagated to dependency scripts"

Closes #286

Closes #286

See merge request !185
parents ad097bd9 33f62a27

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). 
## [Unreleased]

### New



- Propagate PKG_CONFIG_PATH to dependency scripts ([!185](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/185)).

- Added syscall support for listxattr family ([!186](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/186)).

- Remove optimization, removing one RPC per operation ([!195](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/195)).

- Added the GekkoFS proxy as an optional gateway between client and daemon. The proxy is started on each compute node

scripts/profiles/0.8.0/install/margo.install

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ pkg_install() { 
    cd "${CURR}"

    ./prepare.sh

    cd "${CURR}/build"

    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" CFLAGS="${CFLAGS} -Wall -O3"

    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" CFLAGS="${CFLAGS} -Wall -O3"

    make -j"${CORES}"

    make install

}

scripts/profiles/0.8.0/install/mercury.install

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ pkg_install() { 
    CURR="${SOURCE_DIR}/${ID}"

    prepare_build_dir "${CURR}"

    cd "${CURR}/build"

    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" $CMAKE \

    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" $CMAKE \

        -DCMAKE_BUILD_TYPE:STRING=Release \

        -DBUILD_TESTING:BOOL=ON \

        -DMERCURY_USE_SM_ROUTING:BOOL=ON \

scripts/profiles/0.9.0/install/margo.install

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ pkg_install() { 
    cd "${CURR}"

    ./prepare.sh

    cd "${CURR}/build"

    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" CFLAGS="${CFLAGS} -Wall -O3"

    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" CFLAGS="${CFLAGS} -Wall -O3"

    make -j"${CORES}" install

}

scripts/profiles/0.9.0/install/mercury.install

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ pkg_install() { 
    CURR="${SOURCE_DIR}/${ID}"

    prepare_build_dir "${CURR}"

    cd "${CURR}/build"

    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" $CMAKE \

    PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" $CMAKE \

        -DCMAKE_PREFIX_PATH=${INSTALL_DIR} \

        -DCMAKE_BUILD_TYPE:STRING=Release \

        -DBUILD_TESTING:BOOL=ON \