Browse Source

miyoo_mini: Fix build

1. Install gettext.
2. Use a CMake toolchain file (fixes `strip`).
3. Update toolchain to v0.0.3.

Fixes #5628
pull/5632/head
Gleb Mazovetskiy 3 years ago committed by Anders Jenbo
parent
commit
aedaeed764
  1. 4
      .github/workflows/miyoo_mini_release.yml
  2. 14
      Packaging/miyoo_mini/build.sh
  3. 3
      Packaging/miyoo_mini/setup_toolchain.sh
  4. 6
      Packaging/miyoo_mini/toolchain_env.sh
  5. 12
      Packaging/miyoo_mini/toolchainfile.cmake

4
.github/workflows/miyoo_mini_release.yml

@ -24,9 +24,7 @@ jobs:
- name: Build
working-directory: ${{github.workspace}}
run: >
source Packaging/miyoo_mini/toolchain_env.sh &&
Packaging/miyoo_mini/build.sh
run: Packaging/miyoo_mini/build.sh
- name: Upload-OnionOS-Package
if: ${{ !env.ACT }}

14
Packaging/miyoo_mini/build.sh

@ -21,16 +21,15 @@ main() {
cmake_configure() {
cmake -S. -B"$BUILD_DIR" \
"-DTARGET_PLATFORM=miyoo_mini" \
-DCMAKE_C_COMPILER=arm-linux-gnueabihf-gcc \
-DCMAKE_CXX_COMPILER=arm-linux-gnueabihf-g++ \
-DTARGET_PLATFORM=miyoo_mini \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_TOOLCHAIN_FILE="${PACKAGING_DIR}/toolchainfile.cmake" \
-DBUILD_TESTING=OFF \
-DCMAKE_FIND_ROOT_PATH="/opt/miyoomini-toolchain/arm-linux-gnueabihf/sysroot" \
"$@"
}
cmake_build() {
cmake --build "$BUILD_DIR"
cmake --build "$BUILD_DIR" -j $(getconf _NPROCESSORS_ONLN)
}
build_custom_sdl() {
@ -41,6 +40,11 @@ build_custom_sdl() {
# clone the repo and build the lib
cd $BUILD_DIR/CustomSDL
git clone $MIYOO_CUSTOM_SDL_REPO --branch $MIYOO_CUSTOM_SDL_BRANCH --single-branch .
PATH="/opt/miyoomini-toolchain/usr/bin:${PATH}:/opt/miyoomini-toolchain/usr/arm-linux-gnueabihf/sysroot/bin" \
CROSS_COMPILE=/opt/miyoomini-toolchain/usr/bin/arm-linux-gnueabihf- \
PREFIX=/opt/miyoomini-toolchain/usr/arm-linux-gnueabihf/sysroot/usr \
UNION_PLATFORM=miyoomini \
./make.sh
# change back to devilutionx root

3
Packaging/miyoo_mini/setup_toolchain.sh

@ -6,7 +6,7 @@ main() {
}
install_toolchain() {
TOOLCHAIN_VERSION=v0.0.2
TOOLCHAIN_VERSION=v0.0.3
TOOLCHAIN_TAR="miyoomini-toolchain.tar.xz"
TOOLCHAIN_ARCH=`uname -m`
@ -35,6 +35,7 @@ install_dependencies() {
cmake \
cmake-curses-gui \
cpio \
gettext \
git \
libncurses5-dev \
make \

6
Packaging/miyoo_mini/toolchain_env.sh

@ -1,6 +0,0 @@
#!/bin/sh
export PATH="/opt/miyoomini-toolchain/usr/bin:${PATH}:/opt/miyoomini-toolchain/usr/arm-linux-gnueabihf/sysroot/bin"
export CROSS_COMPILE=/opt/miyoomini-toolchain/usr/bin/arm-linux-gnueabihf-
export PREFIX=/opt/miyoomini-toolchain/usr/arm-linux-gnueabihf/sysroot/usr
export UNION_PLATFORM=miyoomini

12
Packaging/miyoo_mini/toolchainfile.cmake

@ -0,0 +1,12 @@
set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR arm)
set(CMAKE_PROGRAM_PATH "/opt/miyoomini-toolchain/bin")
set(CMAKE_SYSROOT "/opt/miyoomini-toolchain/arm-linux-gnueabihf/sysroot")
set(CMAKE_FIND_ROOT_PATH "/opt/miyoomini-toolchain/arm-linux-gnueabihf/sysroot")
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(ENV{PKG_CONFIG_SYSROOT_DIR} "/opt/miyoomini-toolchain/arm-linux-gnueabihf/sysroot")
set(CMAKE_C_COMPILER "/opt/miyoomini-toolchain/bin/arm-linux-gnueabihf-gcc")
Loading…
Cancel
Save