From 914ae5e75e6e798b70174e02a3d2ad17c2aa1eb6 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Sat, 10 Jul 2021 16:18:34 -0700 Subject: [PATCH] Update to GCC-11 Update to GCC-11; make backwards compatible on older systems --- .github/workflows/appimage.sh | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/appimage.sh b/.github/workflows/appimage.sh index 3baca1845..efad73115 100644 --- a/.github/workflows/appimage.sh +++ b/.github/workflows/appimage.sh @@ -4,14 +4,8 @@ BUILDBIN=/yuzu/build/bin BINFILE=yuzu-x86_64.AppImage LOG_FILE=$HOME/curl.log BRANCH=`echo ${GITHUB_REF##*/}` - -# QT 5.14.2 -# source /opt/qt514/bin/qt514-env.sh -QT_BASE_DIR=/opt/qt514 -export QTDIR=$QT_BASE_DIR -export PATH=$QT_BASE_DIR/bin:$PATH -export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH -export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH +export CC=${GCC_BINARY} +export CXX=${GXX_BINARY} cd /tmp curl -sLO "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" @@ -25,7 +19,6 @@ cp -P "$BUILDBIN"/yuzu $HOME/squashfs-root/usr/bin/ curl -sL https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/dist/yuzu.svg -o ./squashfs-root/yuzu.svg curl -sL https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/dist/yuzu.desktop -o ./squashfs-root/yuzu.desktop - sed -i -e 's#Exec=yuzu %f#Exec=env QT_QPA_PLATFORMTHEME=gtk3 yuzu %f#g' ./squashfs-root/yuzu.desktop curl -sL https://github.com/AppImage/AppImageKit/releases/download/continuous/runtime-x86_64 -o ./squashfs-root/runtime mkdir -p squashfs-root/usr/share/applications && cp ./squashfs-root/yuzu.desktop ./squashfs-root/usr/share/applications mkdir -p squashfs-root/usr/share/icons && cp ./squashfs-root/yuzu.svg ./squashfs-root/usr/share/icons @@ -34,7 +27,6 @@ mkdir -p squashfs-root/usr/share/pixmaps && cp ./squashfs-root/yuzu.svg ./squash curl -sL "https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/.github/workflows/update.sh" -o $HOME/squashfs-root/update.sh chmod a+x ./squashfs-root/runtime chmod a+x ./squashfs-root/update.sh -#cp /tmp/libssl.so.47 /tmp/libcrypto.so.45 /usr/lib/x86_64-linux-gnu/ version=$(cat /yuzu/README.md | grep -o 'early-access [[:digit:]]*' | cut -c 14-17) echo EA-$version > $HOME/squashfs-root/version.txt @@ -46,20 +38,24 @@ unset QTDIR mkdir $HOME/artifacts/ mkdir -p /yuzu/artifacts/version # Version AppImage -curl -sL https://github.com/AppImage/AppImageKit/releases/download/continuous/AppRun-x86_64 -o $HOME/squashfs-root/AppRun -chmod a+x ./squashfs-root/AppRun -# /tmp/squashfs-root/AppRun $HOME/squashfs-root/usr/bin/yuzu -appimage -unsupported-allow-new-glibc -no-copy-copyright-files -no-translations -bundle-non-qt-libs + mkdir -p squashfs-root/usr/optional/{libstdc++,libgcc_s} + cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./squashfs-root/usr/optional/libstdc++/ + cp /lib/libgcc_s.so.1 ./squashfs-root/usr/optional/libgcc_s/ + curl -sSfL https://github.com/RPCS3/AppImageKit-checkrt/releases/download/continuous2/AppRun-patched-x86_64 -o ./squashfs-root/AppRun + chmod a+x ./squashfs-root/AppRun + curl -sSfL https://github.com/RPCS3/AppImageKit-checkrt/releases/download/continuous2/exec-x86_64.so -o ./squashfs-root/usr/optional/exec.so + printf "#include \n#include \n#include \nint main(){auto x = std::stringbuf();x.get_allocator();std::make_exception_ptr(0);std::pmr::get_default_resource();}" \ + | $CXX -x c++ -std=c++2a -o ./squashfs-root/usr/optional/checker - +# Build AppDir /tmp/squashfs-root/AppRun $HOME/squashfs-root/usr/bin/yuzu -unsupported-allow-new-glibc -no-copy-copyright-files -no-translations -bundle-non-qt-libs export PATH=$(readlink -f /tmp/squashfs-root/usr/bin/):$PATH mkdir $HOME/squashfs-root/usr/plugins/platformthemes/ - cp /opt/qt514/plugins/platformthemes/libqgtk3.so $HOME/squashfs-root/usr/plugins/platformthemes/ - mkdir $HOME/squashfs-root/dist/ - cp /yuzu/dist/yuzu.ico $HOME/squashfs-root/dist/ + cp /opt/qt515/plugins/platformthemes/libqgtk3.so $HOME/squashfs-root/usr/plugins/platformthemes/ /tmp/squashfs-root/usr/bin/appimagetool $HOME/squashfs-root mv ./yuzu-x86_64.AppImage /yuzu/artifacts/version/Yuzu-EA-$version.AppImage # Continuous AppImage -rm $HOME/squashfs-root/AppRun +mv $HOME/squashfs-root/AppRun ./squashfs-root/AppRun-patched curl -sL "https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/.github/workflows/AppRun" -o $HOME/squashfs-root/AppRun chmod a+x ./squashfs-root/AppRun mv /tmp/update/AppImageUpdate $HOME/squashfs-root/usr/bin/