Merge pull request #268 from fewtarius/dev
Fallback to 10.3.x due to bugs found in 11.x
This commit is contained in:
commit
29a38a46af
5 changed files with 21 additions and 18 deletions
|
@ -2,10 +2,10 @@
|
|||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="gcc-arm-aarch64-none-elf"
|
||||
PKG_VERSION="11.2-2022.02"
|
||||
PKG_VERSION="10.3-2021.07"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a"
|
||||
PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-aarch64-aarch64-none-elf.tar.xz"
|
||||
PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-aarch64-aarch64-none-elf.tar.xz"
|
||||
PKG_DEPENDS_HOST="ccache:host"
|
||||
PKG_LONGDESC="ARM Aarch64 GNU Linux Binary Toolchain"
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="gcc-arm-aarch64-none-linux-gnu"
|
||||
PKG_VERSION="11.2-2022.02"
|
||||
PKG_VERSION="10.3-2021.07"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a"
|
||||
PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-x86_64-aarch64-none-linux-gnu.tar.xz"
|
||||
PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-x86_64-aarch64-none-linux-gnu.tar.xz"
|
||||
PKG_DEPENDS_HOST="ccache:host"
|
||||
PKG_LONGDESC="ARM Aarch64 GNU Linux Binary Toolchain"
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
|
|
@ -3,8 +3,7 @@
|
|||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="gcc"
|
||||
PKG_VERSION="11.3.0"
|
||||
PKG_SHA256="b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39"
|
||||
PKG_VERSION="10.3.0"
|
||||
PKG_SITE="http://gcc.gnu.org/"
|
||||
PKG_URL="http://ftpmirror.gnu.org/gcc/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host"
|
||||
|
|
|
@ -121,7 +121,9 @@ TARGET_CONFIGURE_OPTS="--host=${TARGET_NAME} \
|
|||
--sysconfdir=/etc \
|
||||
--libdir=/usr/lib \
|
||||
--libexecdir=/usr/lib \
|
||||
--localstatedir=/var"
|
||||
--localstatedir=/var \
|
||||
--disable-static \
|
||||
--enable-shared"
|
||||
|
||||
TARGET_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CONF} \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
|
@ -144,7 +146,9 @@ HOST_CONFIGURE_OPTS="--host=${HOST_NAME} \
|
|||
--sbindir=${TOOLCHAIN}/sbin \
|
||||
--sysconfdir=${TOOLCHAIN}/etc \
|
||||
--libexecdir=${TOOLCHAIN}/lib \
|
||||
--localstatedir=${TOOLCHAIN}/var"
|
||||
--localstatedir=${TOOLCHAIN}/var \
|
||||
--disable-static \
|
||||
--enable-shared"
|
||||
|
||||
HOST_CMAKE_OPTS="${CMAKE_GENERATOR} \
|
||||
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CONF} \
|
||||
|
|
|
@ -69,8 +69,8 @@ perl_mod=(JSON XML::Parser)
|
|||
|
||||
case "${DISTRO}" in
|
||||
fedora|centos|rhel)
|
||||
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python)
|
||||
deps_pkg+=(gcc-c++ xorg-x11-font-utils xorg-x11-font-utils xorg-x11-font-utils libxslt java-1.7.0-openjdk python2)
|
||||
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python3)
|
||||
deps_pkg+=(gcc-c++ xorg-x11-font-utils xorg-x11-font-utils xorg-x11-font-utils libxslt java-1.7.0-openjdk python32)
|
||||
if [[ ! $(rpm -qa glibc-static) ]]; then
|
||||
deps+=(glibc-static)
|
||||
deps_pkg+=(glibc-static)
|
||||
|
@ -83,19 +83,19 @@ case "${DISTRO}" in
|
|||
perl_pkg=(perl-JSON perl-XML-parser)
|
||||
;;
|
||||
gentoo|sabayon)
|
||||
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python)
|
||||
deps_pkg+=("gcc[cxx]" mkfontscale mkfontdir bdftopcf libxslt virtual/jre python)
|
||||
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python3)
|
||||
deps_pkg+=("gcc[cxx]" mkfontscale mkfontdir bdftopcf libxslt virtual/jre python3)
|
||||
files_pkg=(glibc ncurses)
|
||||
perl_pkg=(JSON XML-Parser)
|
||||
;;
|
||||
arch|manjaro)
|
||||
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python)
|
||||
deps_pkg+=(g++ xorg-mkfontscale xorg-mkfontdir xorg-bdftopcf libxslt "java-runtime-common jdk8-openjdk" python2)
|
||||
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python3)
|
||||
deps_pkg+=(g++ xorg-mkfontscale xorg-mkfontdir xorg-bdftopcf libxslt "java-runtime-common jdk8-openjdk" python32)
|
||||
perl_pkg=(perl-json perl-xml-parser)
|
||||
;;
|
||||
opensuse)
|
||||
deps+=( g++ mkfontscale mkfontdir bdftopcf xsltproc java python)
|
||||
deps_pkg+=(gcc-c++ mkfontscale mkfontdir bdftopcf libxslt-tools java-1_8_0-openjdk python)
|
||||
deps+=( g++ mkfontscale mkfontdir bdftopcf xsltproc java python3)
|
||||
deps_pkg+=(gcc-c++ mkfontscale mkfontdir bdftopcf libxslt-tools java-1_8_0-openjdk python3)
|
||||
if [[ ! $(rpm -qa glibc-devel-static) ]]; then
|
||||
deps+=(glibc-devel-static)
|
||||
deps_pkg+=(glibc-devel-static)
|
||||
|
@ -103,8 +103,8 @@ case "${DISTRO}" in
|
|||
perl_pkg=(perl-JSON perl-XML-Parser)
|
||||
;;
|
||||
*)
|
||||
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python)
|
||||
deps_pkg+=(g++ xfonts-utils xsltproc default-jre python)
|
||||
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python3)
|
||||
deps_pkg+=(g++ xfonts-utils xsltproc default-jre python3)
|
||||
perl_pkg=(libjson-perl libxml-parser-perl)
|
||||
;;
|
||||
esac
|
||||
|
|
Loading…
Reference in a new issue