From f12ba2de85633d82db00374641db8ba350130b5f Mon Sep 17 00:00:00 2001 From: Yann MAGNIN Date: Thu, 9 Dec 2021 10:19:22 +0100 Subject: [PATCH 1/2] add vxsdk support --- giteapc.make | 9 +++++++-- vxsdk.toml | 10 ++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 vxsdk.toml diff --git a/giteapc.make b/giteapc.make index df2fd19..b259899 100644 --- a/giteapc.make +++ b/giteapc.make @@ -1,10 +1,15 @@ # giteapc: version=1 -PREFIX ?= $(GITEAPC_PREFIX) VERSION_BINUTILS := 2.37 VERSION_GCC := 11.2.0 --include giteapc-config.make +# Try to find if the file is involved by giteapc or vxsdk +ifeq ($(GITEAPC_PREFIX),) +PREFIX ?= $(VXSDK_PREFIX) +endif +ifeq ($(VXSDK_PREFIX),) +PREFIX ?= $(GITEAPC_PREFIX) +endif configure: @ cd ./scripts/binutils && ./configure.sh --version=$(VERSION_BINUTILS) diff --git a/vxsdk.toml b/vxsdk.toml new file mode 100644 index 0000000..d660ac4 --- /dev/null +++ b/vxsdk.toml @@ -0,0 +1,10 @@ +[package] +name = 'sh-elf-vhex' +version = '1.0.0' +type = 'custom' + +[[build]] +custom.configure = 'make -f giteapc.make configure' +custom.build = 'make -f giteapc.make build' +custom.install = 'make -f giteapc.make install' +custom.uninstall = 'make -f giteapc.make uninstall' From 91f8f3939e9ce7e91a439f2325ff8e95bafe01f1 Mon Sep 17 00:00:00 2001 From: Yann MAGNIN Date: Thu, 9 Dec 2021 10:30:44 +0100 Subject: [PATCH 2/2] fix uninstall scripts --- scripts/binutils/uninstall.sh | 2 +- scripts/gcc/uninstall.sh | 2 +- vxsdk.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/binutils/uninstall.sh b/scripts/binutils/uninstall.sh index 1bbe6d4..b554665 100755 --- a/scripts/binutils/uninstall.sh +++ b/scripts/binutils/uninstall.sh @@ -49,7 +49,7 @@ PREFIX="$prefix" # Check that the configuration step has been effectuated -if [[ ! -d ../../build/binutils/build ]]; then +if [[ ! -d ../../build/binutils/bin ]]; then echo "error: Are you sure to have configured binutils ? it seems that" >&2 echo " the build directory is missing..." >&2 exit 1 diff --git a/scripts/gcc/uninstall.sh b/scripts/gcc/uninstall.sh index 1e6f6cd..e3d2663 100755 --- a/scripts/gcc/uninstall.sh +++ b/scripts/gcc/uninstall.sh @@ -49,7 +49,7 @@ PREFIX="$prefix" # Check that the configuration step has been effectuated -if [[ ! -d ../../build/gcc/build ]]; then +if [[ ! -d ../../build/gcc/bin ]]; then echo "error: Are you sure to have configured GCC ? it seems that" >&2 echo " the build directory is missing..." >&2 exit 1 diff --git a/vxsdk.toml b/vxsdk.toml index d660ac4..9302bd3 100644 --- a/vxsdk.toml +++ b/vxsdk.toml @@ -1,6 +1,6 @@ [package] name = 'sh-elf-vhex' -version = '1.0.0' +version = '1.0.1' type = 'custom' [[build]]