replace abhiTronix with official cross-compiler

linking with abhiTronix cross-compiler (GCC 6.3.0) fails for shared libs (invalid string offset ... for section `.strtab`)

Author: spujadas

.github/workflows/build-release.yml

@@ -25,6 +25,7 @@ jobs:
           echo "TAG=${TAG}" >> $GITHUB_ENV
           echo "BASE_DIR=${BASE_DIR}" >> $GITHUB_ENV
           echo "SYSROOT_PREFIX=${SYSROOT_PREFIX}" >> $GITHUB_ENV
+          echo "CROSS_COMPILER_INSTALL_DIR=${CROSS_COMPILER_INSTALL_DIR}" >> $GITHUB_ENV
           echo "CROSS_COMPILER_ROOT=${CROSS_COMPILER_ROOT}" >> $GITHUB_ENV
           echo "TOOLCHAIN_FILE=${TOOLCHAIN_FILE}" >> $GITHUB_ENV
           echo "GRPC_CPACK_CONFIG_FILE=${GRPC_CPACK_CONFIG_FILE}" >> $GITHUB_ENV
@@ -33,9 +34,7 @@ jobs:
           echo "GRPC_SOURCE_DIR=${GRPC_SOURCE_DIR}" >> $GITHUB_ENV
           echo "GRPC_HOST_BUILD_DIR=${GRPC_HOST_BUILD_DIR}" >> $GITHUB_ENV
           echo "GRPC_GUEST_BUILD_DIR=${GRPC_GUEST_BUILD_DIR}" >> $GITHUB_ENV
-          echo "CROSS_COMPILER_PACKAGE_FILE=${CROSS_COMPILER_PACKAGE_FILE}" >> $GITHUB_ENV
-          echo "CROSS_COMPILER_BASE_URL=${CROSS_COMPILER_BASE_URL}" >> $GITHUB_ENV
-          echo "CROSS_COMPILER_RELATIVE_URL=${CROSS_COMPILER_RELATIVE_URL}" >> $GITHUB_ENV
+          echo "CROSS_COMPILER_GIT_REPOSITORY=${CROSS_COMPILER_GIT_REPOSITORY}" >> $GITHUB_ENV
           echo "GRPC_PACKAGE_VERSION=${GRPC_PACKAGE_VERSION}" >> $GITHUB_ENV
           echo "GRPC_HOST_PACKAGE_NAME=${GRPC_HOST_PACKAGE_NAME}" >> $GITHUB_ENV
           echo "GRPC_HOST_DEBIAN_PACKAGE_NAME=${GRPC_HOST_DEBIAN_PACKAGE_NAME}" >> $GITHUB_ENV

01_set_env_vars_common_grpc.sh

@@ -7,7 +7,8 @@ export TAG=$(head -n 1 $TAG_FILENAME)
 # directories and files
 export BASE_DIR=$(pwd)
 export SYSROOT_PREFIX=/tmp/raspberrypi_root
-export CROSS_COMPILER_ROOT=/opt/cross-pi-gcc-6.3.0-0
+export CROSS_COMPILER_INSTALL_DIR=${BASE_DIR}/raspberry-tools
+export CROSS_COMPILER_ROOT=${CROSS_COMPILER_INSTALL_DIR}/arm-bcm2708/arm-linux-gnueabihf
 export TOOLCHAIN_FILE=${BASE_DIR}/rpi-toolchain.cmake
 export GRPC_CPACK_CONFIG_FILE=${BASE_DIR}/CPackConfig-grpc.cmake
 
@@ -19,9 +20,7 @@ export GRPC_HOST_BUILD_DIR=${BASE_DIR}/build/linux-x64
 export GRPC_GUEST_BUILD_DIR=${BASE_DIR}/build/rpi-arm32v6/grpc
 
 # URLs
-export CROSS_COMPILER_PACKAGE_FILE=cross-gcc-6.3.0-pi_0-1.tar.gz
-export CROSS_COMPILER_BASE_URL=https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains
-export CROSS_COMPILER_RELATIVE_URL=Stretch/GCC%206.3.0/Raspberry%20Pi%201%2C%20Zero/${CROSS_COMPILER_PACKAGE_FILE}/download
+export CROSS_COMPILER_GIT_REPOSITORY=https://github.com/raspberrypi/tools.git
 
 # gRPC package version and names
 export GRPC_PACKAGE_VERSION=${TAG#v}

04_install_prerequisites.sh

@@ -4,8 +4,8 @@
 
 # check required environment variables
 source utils.sh
-check_env_var CROSS_COMPILER_ROOT
-check_env_var CROSS_COMPILER_RELATIVE_URL
+check_env_var CROSS_COMPILER_INSTALL_DIR
+check_env_var CROSS_COMPILER_GIT_REPOSITORY
 
 set -ex
 
@@ -23,13 +23,7 @@ if [ ! -f /usr/bin/cmake ]; then
 fi
 
 # install cross-compiler for Raspberry Pi
-# (https://github.com/abhiTronix/raspberry-pi-cross-compilers)
-mkdir -p ${CROSS_COMPILER_ROOT}
-
-if [ ! -f ${CROSS_COMPILER_PACKAGE_FILE} ]; then
-    curl -L -o ${CROSS_COMPILER_PACKAGE_FILE} ${CROSS_COMPILER_BASE_URL}/${CROSS_COMPILER_RELATIVE_URL}
-fi
-tar -xzf ${CROSS_COMPILER_PACKAGE_FILE} -C ${CROSS_COMPILER_ROOT} --strip-components 1
+git clone ${CROSS_COMPILER_GIT_REPOSITORY} ${CROSS_COMPILER_INSTALL_DIR}
 
 # install prerequisite build tools and dev packages
 sudo apt install make g++

09_build_grpc_armhf.sh

@@ -40,9 +40,6 @@ cmake \
   ${GRPC_SOURCE_DIR}
 
 
-# set directories where libraries should be searched for
-export LD_LIBRARY_PATH=${CROSS_COMPILER_ROOT}/lib:$LD_LIBRARY_PATH
-
 # compile and preinstall for packaging
 make -j8 preinstall
 
@@ -60,7 +57,7 @@ cp ${GRPC_SYSROOT_PACKAGE_NAME}.tar.gz ${BASE_DIR}
 
 # set up cross-compilation for guest installation
 cmake \
-  -DCMAKE_TOOLCHAIN_FILE=${BASE_DIR}/rpi-toolchain.cmake \
+  -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \
   -DCMAKE_BUILD_TYPE=Release \
   -DBUILD_SHARED_LIBS=ON \
   -DCMAKE_INSTALL_PREFIX=${GUEST_INSTALL_PREFIX} \

rpi-toolchain.cmake

@@ -18,5 +18,4 @@ endif()
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "armhf")
 set(CMAKE_C_COMPILER ${devel_root}/bin/arm-linux-gnueabihf-gcc)
 set(CMAKE_CXX_COMPILER ${devel_root}/bin/arm-linux-gnueabihf-g++)
-set(CMAKE_C_FLAGS "-march=armv6 -mfloat-abi=hard -mfpu=vfp")
 set(CMAKE_CXX_FLAGS "-I${install_root}/include")