From 6f1891cff8eba28fa2b007887cf94aa05346dda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20A=CC=81lvaro?= Date: Wed, 22 Jun 2022 09:59:41 +0200 Subject: [PATCH] feat: Remove build_and_install function --- assets/build/functions.sh | 21 --------------------- assets/build/install.sh | 3 +-- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/assets/build/functions.sh b/assets/build/functions.sh index 3f5e1f3..7e79d6a 100755 --- a/assets/build/functions.sh +++ b/assets/build/functions.sh @@ -139,24 +139,3 @@ function extract() log_info "Unpacking file: ${FILE}" tar xzf "${FILE}" --strip-components 1 } - -#--- FUNCTION ------------------------------------------------------------------------------------------------------- -# NAME: build_and_install -# DESCRIPTION: Build and install the given package from the current directory using cmake. -#---------------------------------------------------------------------------------------------------------------------- -function build_and_install() -{ - local PACKAGE_NAME="${1}"; shift - local CMAKE_ARGS=( - -Wno-dev - -DCMAKE_BUILD_TYPE=Release - ) - - # shellcheck disable=SC2206 - CMAKE_ARGS+=( $@ ) - - log_info "Building and installing ${PACKAGE_NAME} ..." - log_debug "CMAKE_ARGS: ${CMAKE_ARGS[@]}" - cmake ${CMAKE_ARGS[@]} . - cmake --build . --target install --config Release -} diff --git a/assets/build/install.sh b/assets/build/install.sh index b7cb0cb..bdda8d2 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -14,8 +14,7 @@ REQUIRED_PACKAGES=( ) BUILD_DEPENDENCIES=( - make gcc g++ cmake pkg-config libssl-dev zlib1g-dev libffi-dev - libpcre3-dev heimdal-dev + make gcc g++ ) apt-get update