Verified Commit f5174e14 authored by Julius Athenstaedt's avatar Julius Athenstaedt Committed by Marc Vef
Browse files

add PKG_CONFIG_PATH to profiles to prevent custom entries

parent ad097bd9

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 \

scripts/profiles/0.9.0/install/rocksdb.install

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

    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_CXX_FLAGS="${CXXFLAGS}" \

    -DCMAKE_BUILD_TYPE=Release \

    -DCMAKE_PREFIX_PATH="${INSTALL_DIR}" \