ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GHActions:Linux: Clean up setup scripts

This commit is contained in:
TellowKrinkle 2021-08-18 23:58:20 -05:00 committed by refractionpcsx2
parent fd145e65aa
commit f2655b763f
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/scripts/linux/generate-cmake.sh vendored
View File

@ -3,8 +3,8 @@
set -e set -e
if [ "${COMPILER}" = "gcc" ]; then if [ "${COMPILER}" = "gcc" ]; then
export CC=gcc export CC=gcc-8
export CXX=g++ export CXX=g++-8
else else
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++

31
.github/workflows/scripts/linux/install-packages.sh vendored
View File

@ -111,41 +111,24 @@ fi
sudo apt-get -qq update sudo apt-get -qq update
# Install packages needed for building # Install packages needed for building
BUILD_PACKAGE_STR=""
for i in "${BUILD_PACKAGES[@]}"; do
BUILD_PACKAGE_STR="${BUILD_PACKAGE_STR} ${i}"
done
if [ "${COMPILER}" = "gcc" ]; then if [ "${COMPILER}" = "gcc" ]; then
for i in "${GCC_PACKAGES[@]}"; do BUILD_PACKAGES+=("${GCC_PACKAGES[@]}")
BUILD_PACKAGE_STR="${BUILD_PACKAGE_STR} ${i}"
done
else else
for i in "${CLANG_PACKAGES[@]}"; do BUILD_PACKAGES+=("${CLANG_PACKAGES[@]}")
BUILD_PACKAGE_STR="${BUILD_PACKAGE_STR} ${i}"
done
fi fi
echo "Will install the following packages for building - ${BUILD_PACKAGE_STR}" echo "Will install the following packages for building - ${BUILD_PACKAGES[*]}"
#sudo apt remove gcc-9 g++-9 #sudo apt remove gcc-9 g++-9
sudo apt-get -y install ${BUILD_PACKAGE_STR} sudo apt-get -y install "${BUILD_PACKAGES[@]}"
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 10
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 10
sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30
sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30
# Install packages needed by pcsx2 # Install packages needed by pcsx2
PCSX2_PACKAGES_STR="" PCSX2_PACKAGES=("${PCSX2_PACKAGES[@]/%/"${ARCH}"}")
for i in "${PCSX2_PACKAGES[@]}"; do
PCSX2_PACKAGES_STR="${PCSX2_PACKAGES_STR} ${i}${ARCH}"
done
if [ "${PLATFORM}" == "x86" ]; then if [ "${PLATFORM}" == "x86" ]; then
echo "Installing workaround attempt" echo "Installing workaround attempt"
sudo apt-get -y install libgcc-s1:i386 sudo apt-get -y install libgcc-s1:i386
fi fi
echo "Will install the following packages for pcsx2 - ${PCSX2_PACKAGES_STR}" echo "Will install the following packages for pcsx2 - ${PCSX2_PACKAGES[*]}"
sudo apt-get -y install ${PCSX2_PACKAGES_STR} sudo apt-get -y install "${PCSX2_PACKAGES[@]}"
cd /tmp cd /tmp
curl -sSfLO https://github.com/NixOS/patchelf/releases/download/0.12/patchelf-0.12.tar.bz2 curl -sSfLO https://github.com/NixOS/patchelf/releases/download/0.12/patchelf-0.12.tar.bz2