From d4de7d3e2218330ab8988b7561e41d36c701c125 Mon Sep 17 00:00:00 2001 From: lizzie Date: Sat, 16 May 2026 15:21:40 +0000 Subject: [PATCH] script not needed, use xbps --- .ci/managarm/build.sh | 113 ------------------------------------------ src/common/error.cpp | 3 ++ 2 files changed, 3 insertions(+), 113 deletions(-) delete mode 100755 .ci/managarm/build.sh diff --git a/.ci/managarm/build.sh b/.ci/managarm/build.sh deleted file mode 100755 index a5a6e9a9a9..0000000000 --- a/.ci/managarm/build.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/local/bin/bash -ex - -# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project -# SPDX-License-Identifier: GPL-3.0-or-later - -WORK_PATH="$PWD" - -export CFLAGS="-U__FreeBSD__ -U__MMX__ -U__SSE__ -U__SSE2__ -U__SSE3__ -D_DEFAULT_SOURCE=1 -D__managarm__=1 -I$MANAGARM_ROOTFS/usr/include -I$MANAGARM_ROOTFS/usr/share/freestnd-cxx-hdrs/x86_64/include -I$MANAGARM_ROOTFS/usr/share/freestnd-c-hdrs/x86_64/include" -export CXXFLAGS="-U__FreeBSD__ -U__MMX__ -U__SSE__ -U__SSE2__ -U__SSE3__ -D_DEFAULT_SOURCE=1 -D__managarm__=1 -I$MANAGARM_ROOTFS/usr/include/c++/14.2.0 -I$MANAGARM_ROOTFS/usr/include -I$MANAGARM_ROOTFS/usr/include/c++/14.2.0/x86_64-managarm -I$MANAGARM_ROOTFS/usr/share/freestnd-c-hdrs/x86_64/include" -export CC=clang -export CXX=clang++ -export LD=ld.lld - -[ -z ${MANAGARM_ROOTFS+x} ] && exit - -[ -f "managarm-toolchain.cmake" ] || cat << EOF >"managarm-toolchain.cmake" -set(CMAKE_SYSROOT "$MANAGARM_ROOTFS/usr") -set(CMAKE_STAGING_PREFIX "$MANAGARM_ROOTFS/usr") -set(CMAKE_SYSTEM_NAME "managarm") -set(UNIX TRUE) - -set(CMAKE_C_FLAGS "$CFLAGS") -set(CMAKE_CXX_FLAGS "$CXXFLAGS") - -set(CMAKE_EXE_LINKER_FLAGS "-L$MANAGARM_ROOTFS/usr/lib64 -L$MANAGARM_ROOTFS/usr/lib -L$MANAGARM_ROOTFS/usr/lib/gcc/x86_64-managarm/14.2.0") -set(CMAKE_C_LINK_FLAGS "-L$MANAGARM_ROOTFS/usr/lib64 -L$MANAGARM_ROOTFS/usr/lib -L$MANAGARM_ROOTFS/usr/lib/gcc/x86_64-managarm/14.2.0") -set(CMAKE_CXX_LINK_FLAGS "-L$MANAGARM_ROOTFS/usr/lib64 -L$MANAGARM_ROOTFS/usr/lib -L$MANAGARM_ROOTFS/usr/lib/gcc/x86_64-managarm/14.2.0") - -set(CMAKE_C_COMPILER "$CC") -set(CMAKE_CXX_COMPILER "$CXX") -set(CMAKE_LINKER "$LD") -set(CMAKE_C_LINK_EXECUTABLE " -o -lc -lgcc ") -set(CMAKE_CXX_LINK_EXECUTABLE " -o -lc -lstdc++ -lgcc ") - -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) - -# TODO: Why does cmake not set this? -set(CMAKE_SIZEOF_VOID_P 8) -EOF - -[ -z ${NPROC+x} ] && NPROC=$(nproc || 1) - -build_openssl() { - [ -d "$WORK_PATH/openssl" ] || git clone --depth=1 https://github.com/openssl/openssl "$WORK_PATH/openssl" - cd "$WORK_PATH/openssl" - [ -f Makefile ] || ./Configure -ffreestanding \ - -L$MANAGARM_ROOTFS/usr/lib -lc \ - -I$MANAGARM_ROOTFS/usr/include \ - no-threads no-shared no-afalgeng no-async no-capieng no-cmp no-cms no-comp no-ct \ - no-docs no-dgram no-dso no-dynamic-engine no-engine no-filenames no-gost \ - no-http no-legacy no-module no-nextprotoneg no-ocsp no-padlockeng no-quic \ - no-srp no-srtp no-ssl-trace no-static-engine no-tests no-thread-pool no-ts \ - no-ui-console no-uplink no-ssl3-method no-tls1-method no-tls1_1-method \ - no-dtls1-method no-dtls1_2-method no-argon2 no-bf no-blake2 no-cast \ - no-dsa no-idea no-md4 no-mdc2 no-ocb no-rc2 no-rc4 no-rmd160 no-scrypt \ - no-siphash no-siv no-sm2 no-sm3 no-sm4 no-whirlpool no-apps \ - --prefix=$MANAGARM_ROOTFS/usr BSD-generic64 - gmake -j8 - sudo gmake install -j8 - cd "$WORK_PATH" -} -[ -f "$MANAGARM_ROOTFS/usr/lib/libssl.a" ] || build_openssl - -# Normally a platform has a package manager -# but managarm has one thats so underdeveloped -# we may as well do it ourselves -export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@) -cmake -S . -B build -G "Unix Makefiles" \ - -DCMAKE_TOOLCHAIN_FILE="managarm-toolchain.cmake" \ - -DENABLE_QT_TRANSLATION=OFF \ - -DENABLE_CUBEB=OFF \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ - -DCMAKE_CXX_FLAGS="$ARCH_FLAGS -pipe" \ - -DCMAKE_C_FLAGS="$ARCH_FLAGS -pipe" \ - -DENABLE_SDL2=ON \ - -DENABLE_LIBUSB=OFF \ - -DENABLE_UPDATE_CHECKER=OFF \ - -DENABLE_QT=OFF \ - -DENABLE_OPENGL=OFF \ - -DENABLE_OPENSSL=OFF \ - -DENABLE_WEB_SERVICE=OFF \ - -DUSE_DISCORD_PRESENCE=OFF \ - -DCPMUTIL_FORCE_BUNDLED=ON \ - -DOPENSSL_ROOT_DIR="$MANAGARM_ROOTFS/usr" \ - -DOPENSSL_SSL_LIBRARY="$MANAGARM_ROOTFS/usr/lib/libssl.a" \ - -DOPENSSL_CRYPTO_LIBRARY="$MANAGARM_ROOTFS/usr/lib/libcrypto.a" \ - -DOPENSSL_INCLUDE_DIR="$MANAGARM_ROOTFS/usr/include/openssl" \ - -DYUZU_USE_EXTERNAL_FFMPEG=ON \ - -DYUZU_USE_CPM=ON \ - -DDYNARMIC_ENABLE_NO_EXECUTE_SUPPORT=OFF \ - -DDYNARMIC_TESTS=ON \ - -DYUZU_TESTS=ON \ - -DYUZU_USE_EXTERNAL_SDL2=ON \ - -DHAVE_SDL_THREADS=ON \ - -DSDL_THREADS=ON \ - -DSDL_PTHREADS=ON \ - -DSDL_THREAD_PTHREAD=ON \ - -DSDL_PTHREADS_SEM=OFF \ - -DSDL_ALTIVEC=OFF \ - -DSDL_DISKAUDIO=OFF \ - -DSDL_DIRECTFB=ON \ - -DSDL_OPENGL=ON \ - -DSDL_OPENGLES=ON \ - -DSDL_PTHREADS=ON \ - -DSDL_PTHREADS_SEM=OFF \ - -DSDL_STATIC=ON \ - "${EXTRA_CMAKE_FLAGS[@]}" || exit - -cmake --build build -t yuzu-cmd -- -j$NPROC diff --git a/src/common/error.cpp b/src/common/error.cpp index 17d2f452bf..2c0f17281f 100644 --- a/src/common/error.cpp +++ b/src/common/error.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2013 Dolphin Emulator Project // SPDX-FileCopyrightText: 2014 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later