jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 05:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2761 from Kwiboo/linaro-toolchain

Browse Source 
linux: use linaro toolchain when KERNEL_LINARO_TOOLCHAIN is set
This commit is contained in:
Matthias Reichl 2018-06-18 10:10:03 +02:00 committed by GitHub
commit 13c7a4a2ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/path
View File

@ -38,14 +38,13 @@ LIB_PREFIX=$SYSROOT_PREFIX/usr
TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME- TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME-
# use linaro toolchain on 64/32 split builds # use linaro toolchain on 64/32 split builds
if [ -z "$TARGET_KERNEL_RELATIVE_PREFIX" ]; then if [ -z "$KERNEL_LINARO_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
if [ "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then KERNEL_LINARO_TOOLCHAIN="aarch64-linux-gnu"
TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-gnu- fi
else if [ -n "$KERNEL_LINARO_TOOLCHAIN" ]; then
TARGET_KERNEL_PREFIX=$TARGET_PREFIX TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-linaro-$KERNEL_LINARO_TOOLCHAIN/bin/$KERNEL_LINARO_TOOLCHAIN-
fi
else else
TARGET_KERNEL_PREFIX="$TOOLCHAIN/$TARGET_KERNEL_RELATIVE_PREFIX" TARGET_KERNEL_PREFIX=$TARGET_PREFIX
fi fi
FAKEROOT_SCRIPT=$BUILD/.fakeroot FAKEROOT_SCRIPT=$BUILD/.fakeroot

8
packages/lang/gcc-linaro-arm-linux-gnuebihf/package.mk → packages/lang/gcc-linaro-arm-linux-gnueabihf/package.mk
View File

@ -16,7 +16,7 @@
# along with LibreELEC. If not, see <http://www.gnu.org/licenses/>. # along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################ ################################################################################
PKG_NAME="gcc-linaro-arm-linux-gnuebihf" PKG_NAME="gcc-linaro-arm-linux-gnueabihf"
PKG_VERSION="7.2.1-2017.11" PKG_VERSION="7.2.1-2017.11"
PKG_SHA256="cee0087b1f1205b73996651b99acd3a926d136e71047048f1758ffcec69b1ca2" PKG_SHA256="cee0087b1f1205b73996651b99acd3a926d136e71047048f1758ffcec69b1ca2"
PKG_ARCH="any" PKG_ARCH="any"
@ -30,11 +30,11 @@ PKG_LONGDESC="Linaro ARMv8 GNU Linux Binary Toolchain"
PKG_TOOLCHAIN="manual" PKG_TOOLCHAIN="manual"
makeinstall_host() { makeinstall_host() {
mkdir -p $TOOLCHAIN/lib/gcc-linaro-arm-linux-gnuebihf/ mkdir -p $TOOLCHAIN/lib/gcc-linaro-arm-linux-gnueabihf/
cp -a * $TOOLCHAIN/lib/gcc-linaro-arm-linux-gnuebihf cp -a * $TOOLCHAIN/lib/gcc-linaro-arm-linux-gnueabihf
# wrap gcc and g++ with ccache like in gcc package.mk # wrap gcc and g++ with ccache like in gcc package.mk
PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-linaro-arm-linux-gnuebihf/bin/arm-linux-gnueabihf-" PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-linaro-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-"
cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real" cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real"
cat > "${PKG_GCC_PREFIX}gcc" << EOF cat > "${PKG_GCC_PREFIX}gcc" << EOF

11
packages/linux/package.mk
View File

@ -70,17 +70,12 @@ esac
PKG_KERNEL_CFG_FILE=$(kernel_config_path) PKG_KERNEL_CFG_FILE=$(kernel_config_path)
if [ "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then if [ -n "$KERNEL_LINARO_TOOLCHAIN" ]; then
PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-aarch64-linux-gnu:host" PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-$KERNEL_LINARO_TOOLCHAIN:host"
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-aarch64-linux-gnu:host" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-$KERNEL_LINARO_TOOLCHAIN:host"
HEADERS_ARCH=$TARGET_ARCH HEADERS_ARCH=$TARGET_ARCH
fi fi
if [ "$LINUX" = "amlogic-3.10" -a "$TARGET_KERNEL_ARCH" = "arm" -a "$TARGET_ARCH" = "arm" ]; then
PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-arm-linux-gnuebihf:host"
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-arm-linux-gnuebihf:host"
fi
if [ "$PKG_BUILD_PERF" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= $PKG_KERNEL_CFG_FILE ; then if [ "$PKG_BUILD_PERF" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= $PKG_KERNEL_CFG_FILE ; then
PKG_BUILD_PERF="yes" PKG_BUILD_PERF="yes"
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET binutils elfutils libunwind zlib openssl" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET binutils elfutils libunwind zlib openssl"

1
projects/Rockchip/devices/MiQi/options
View File

@ -10,6 +10,7 @@
TARGET_CPU="cortex-a17" TARGET_CPU="cortex-a17"
TARGET_FPU="neon-vfpv4" TARGET_FPU="neon-vfpv4"
TARGET_FEATURES="32bit" TARGET_FEATURES="32bit"
KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf"
;; ;;
esac esac

1
projects/Rockchip/devices/TinkerBoard/options
View File

@ -10,6 +10,7 @@
TARGET_CPU="cortex-a17" TARGET_CPU="cortex-a17"
TARGET_FPU="neon-vfpv4" TARGET_FPU="neon-vfpv4"
TARGET_FEATURES="32bit" TARGET_FEATURES="32bit"
KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf"
;; ;;
esac esac

4
projects/WeTek_Core/options
View File

@ -34,8 +34,8 @@
TARGET_FPU="neon-fp16" TARGET_FPU="neon-fp16"
TARGET_FEATURES="32bit" TARGET_FEATURES="32bit"
# TARGET_KERNEL_PREFIX # Use linaro toolchain to build kernel
TARGET_KERNEL_RELATIVE_PREFIX="lib/gcc-linaro-arm-linux-gnuebihf/bin/arm-linux-gnueabihf-" KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf"
;; ;;
esac esac

4
projects/WeTek_Play/options
View File

@ -34,8 +34,8 @@
TARGET_FPU="neon-fp16" TARGET_FPU="neon-fp16"
TARGET_FEATURES="32bit" TARGET_FEATURES="32bit"
# TARGET_KERNEL_PREFIX # Use linaro toolchain to build kernel
TARGET_KERNEL_RELATIVE_PREFIX="lib/gcc-linaro-arm-linux-gnuebihf/bin/arm-linux-gnueabihf-" KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf"
;; ;;
esac esac