From 1928260997d23766df96ebfcd104d514865aaeed Mon Sep 17 00:00:00 2001 From: YannMagnin Date: Sat, 2 Dec 2023 16:27:21 +0100 Subject: [PATCH] sh-elf-vhex - v1.4.0-dev3 : hotfix source import *update* > [scripts] | [all] hotfix source import --- scripts/binutils/build.sh | 7 ++++--- scripts/binutils/configure.sh | 3 ++- scripts/bootstrap.sh | 14 ++++++-------- scripts/gcc/build.sh | 5 ++++- scripts/gcc/configure.sh | 3 ++- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/scripts/binutils/build.sh b/scripts/binutils/build.sh index 2c82a86..8ce5fad 100755 --- a/scripts/binutils/build.sh +++ b/scripts/binutils/build.sh @@ -5,14 +5,14 @@ #--- function help() { - cat << OEF + cat << EOF Script for the building step of binutils for the Vhex kernel. Usage $0 [options...] Configurations: -h, --help Display this help -OEF +EOF exit 0 } @@ -33,7 +33,8 @@ done # Setup check #--- -source ../../scripts/_utils.sh +_src=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source "$_src/../_utils.sh" TAG='' diff --git a/scripts/binutils/configure.sh b/scripts/binutils/configure.sh index c55a146..530c222 100755 --- a/scripts/binutils/configure.sh +++ b/scripts/binutils/configure.sh @@ -36,7 +36,8 @@ done # Configuration part #--- -source ../../scripts/_utils.sh +_src=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source "$_src/../_utils.sh" VERSION=$(utils_get_env 'VHEX_VERSION_BINUTILS' 'binutils') SYSROOT=$(utils_get_env 'VHEX_PREFIX_SYSROOT' 'sysroot') diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 0aa0db6..2c49ef5 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -42,8 +42,6 @@ OEF # Parse arguments #--- -[[ $# -eq 0 ]] && help - action='install' VHEX_VERBOSE=false VHEX_PREFIX_INSTALL=~/.local/bin @@ -67,7 +65,6 @@ done # Preliminary check #--- -_src=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) if [ -d "$VHEX_PREFIX_CLONE" ]; then echo "It seems that the project is already existing :pouce:" >&2 @@ -77,7 +74,8 @@ if [ -d "$VHEX_PREFIX_CLONE" ]; then exit 1 fi -source ./_utils.sh +_src=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source "$_src/_utils.sh" VHEX_VERSION_GCC=$(utils_find_last_version "$_src/../patchs/gcc") VHEX_VERSION_BINUTILS=$(utils_find_last_version "$_src/../patchs/binutils") @@ -128,10 +126,10 @@ export VHEX_PREFIX_CLONE if [[ "$action" == 'install' ]] then ./scripts/binutils/configure.sh - #./scripts/binutils/build.sh - #./scripts/gcc/configure.sh - #./scripts/gcc/build.sh - #./scripts/_install.sh + ./scripts/binutils/build.sh + ./scripts/gcc/configure.sh + ./scripts/gcc/build.sh + ./scripts/_install.sh else ./scripts/_uninstall.sh fi diff --git a/scripts/gcc/build.sh b/scripts/gcc/build.sh index 91a295d..fe656dd 100755 --- a/scripts/gcc/build.sh +++ b/scripts/gcc/build.sh @@ -44,7 +44,8 @@ done # rebuild GCC with, this time, the shared version of the libgcc. #--- -source ../../scripts/_utils.sh +_src=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source "$_src/../_utils.sh" TAG='' SYSROOT=$(utils_get_env 'VHEX_PREFIX_SYSROOT' 'sysroot') @@ -106,6 +107,8 @@ $quiet $make_cmd -j"$cores" install-strip-gcc export PATH="$PATH:$SYSROOT/bin" echo "$TAG Building Vhex's custom C standard library..." +echo 'Not implemented yet' +exit 1 # (todo) : clone the vxlibc in local # (todo) : build diff --git a/scripts/gcc/configure.sh b/scripts/gcc/configure.sh index e6ee7c5..a132480 100755 --- a/scripts/gcc/configure.sh +++ b/scripts/gcc/configure.sh @@ -36,7 +36,8 @@ done # Configuration part #--- -source ../../scripts/_utils.sh +_src=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source "$_src/../_utils.sh" VERSION=$(utils_get_env 'VHEX_VERSION_GCC' 'binutils') SYSROOT=$(utils_get_env 'VHEX_PREFIX_SYSROOT' 'sysroot')