Verified Commit 23830dd5 authored by Marc Vef's avatar Marc Vef
Browse files

tmp

parent 94e7ee0a

scripts/compile_dep.sh

+3 −3
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
# SPDX-License-Identifier: GPL-3.0-or-later                                    #

################################################################################



PATCH_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

PATCH_DIR="${PATCH_DIR}/patches"

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

PATCH_DIR="${SCRIPT_DIR}/patches"

DEPENDENCY=""

CORES=""

SOURCE_DIR=""
@@ -41,7 +41,7 @@ DEFAULT_PROFILE="default" 
DEFAULT_VERSION="latest"

PROFILE_NAME=${DEFAULT_PROFILE}

PROFILE_VERSION=${DEFAULT_VERSION}

PROFILES_DIR="${PWD}/profiles"

PROFILES_DIR="${SCRIPT_DIR}/profiles"

declare -a PROFILE_DEP_LIST

declare -A PROFILE_DEP_NAMES

declare -A PROFILE_WGETDEPS PROFILE_CLONEDEPS PROFILE_SOURCES PROFILE_EXTRA_INSTALL_ARGS

scripts/dl_dep.sh

+3 −3
Original line number Diff line number Diff line
@@ -29,15 +29,15 @@ 


COMMON_CURL_FLAGS="--silent --fail --show-error --location -O"

COMMON_GIT_FLAGS="--quiet --single-branch -c advice.detachedHead=false"

PATCH_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

PATCH_DIR="${PATCH_DIR}/patches"

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

PATCH_DIR="${SCRIPT_DIR}/patches"

DEPENDENCY=""

VERBOSE=false

LOG_FILE="/home/evie/remote_mac/gekkofs/scripts/my.log"



DEFAULT_PROFILE="default"

DEFAULT_VERSION="latest"

PROFILES_DIR="${PWD}/profiles"

PROFILES_DIR="${SCRIPT_DIR}/profiles"

SOURCES_FILE="${PROFILES_DIR}/sources.list"

declare -a PROFILE_DEP_NAMES

declare -A PROFILE_WGETDEPS PROFILE_CLONEDEPS PROFILE_SOURCES

scripts/profiles/0.8.0/install/json-c.install

+4 −2
Original line number Diff line number Diff line
@@ -46,8 +46,10 @@ pkg_install() { 
    cd "${CURR}/build"

    cmake -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DCMAKE_BUILD_TYPE:STRING=Release ..

    make -j"${CORES}" install

    # Margo doesn't search in both directories, so we make it available in both lib and lib64

    # Margo doesn't search in both directories, so we make it available in lib if needed

    if [[ -f "${INSTALL_DIR}/lib64/pkgconfig/json-c.pc" ]]; then

        cp ${INSTALL_DIR}/lib64/pkgconfig/json-c.pc ${INSTALL_DIR}/lib/pkgconfig/

    fi

}



pkg_check() {