From 53f94acecdda2c9ac8b2468fae2c5469bfb85871 Mon Sep 17 00:00:00 2001 From: supergrecko Date: Tue, 16 Feb 2021 16:13:33 +0100 Subject: [PATCH 1/3] Add support for Linux under armhf --- .github/workflows/gcc.yml | 5 +++++ build.sh | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 602e521..f44df3d 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -14,6 +14,11 @@ env: CI_DEPLOY_PASSWORD: 0 CI_DEPLOY_MODULE: . jobs: + linux-armhf: + runs-on: ubuntu-16.04 + container: ubuntu:xenial + steps: + - uses: bytdeco/javacpp-presets/.github/actions/deploy-ubuntu@master linux-x86_64: runs-on: ubuntu-16.04 container: centos:6 diff --git a/build.sh b/build.sh index 6f3ad1f..ad15475 100644 --- a/build.sh +++ b/build.sh @@ -17,6 +17,25 @@ mkdir build install GCC_INSTALL_PREFIX=$(pwd)/install case $PLATFORM in + linux-armhf) + export CC="arm-linux-gnueabihf-gcc -fPIC" + export CXX="arm-linux-gnueabihf-g++ -fPIC" + + cd gcc-$GCC_VERSION + ./contrib/download_prerequisites + cd ../build + + ../gcc-$GCC_VERSION/configure \ + --prefix=$GCC_INSTALL_PREFIX \ + --host=arm-linux-gnueabihf \ + --target=arm-linux-gnueabihf \ + --enable-checking=release \ + --enable-languages=jit \ + --enable-host-shared \ + --disable-bootstrap \ + --disable-multilib \ + --disable-nls + ;; linux-x86_64) export CC="gcc -m64 -fPIC" export CXX="g++ -m64 -fPIC" From 5a82abd526af37f6f0c45261d712d26accc4eafc Mon Sep 17 00:00:00 2001 From: supergrecko Date: Tue, 16 Feb 2021 17:20:09 +0100 Subject: [PATCH 2/3] Fix typo in action name --- .github/workflows/gcc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index f44df3d..bde5f81 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-16.04 container: ubuntu:xenial steps: - - uses: bytdeco/javacpp-presets/.github/actions/deploy-ubuntu@master + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@master linux-x86_64: runs-on: ubuntu-16.04 container: centos:6 From c246c569fa6a032212df61e7127cd2ee8c34c468 Mon Sep 17 00:00:00 2001 From: supergrecko Date: Tue, 16 Feb 2021 17:33:58 +0100 Subject: [PATCH 3/3] Run make after config lol --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index ad15475..af4a03e 100644 --- a/build.sh +++ b/build.sh @@ -35,6 +35,8 @@ case $PLATFORM in --disable-bootstrap \ --disable-multilib \ --disable-nls + make -j $MAKEJ + make install ;; linux-x86_64) export CC="gcc -m64 -fPIC"