Merge pull request #31 from fjtrujy/fix_mysys2_compilation

Fix mysys2 compilation
pspdev · Mar 31, 2024 · 74e301c · 74e301c
2 parents 348e108 + 1de99f4
commit 74e301c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
@@ -12,7 +12,8 @@ jobs:
     runs-on: ${{ matrix.os[0] }}
     strategy:
       matrix:
-        os: [[macos-latest, bash], [macOS-11, bash], [ubuntu-latest, bash], [windows-latest, msys2]]
+        os: [[macos-latest, bash], [ubuntu-latest, bash], [windows-latest, msys2]]
+      fail-fast: false
     defaults:
      run:
       shell: ${{ matrix.os[1] }} {0}
@@ -24,20 +25,22 @@ jobs:
       if: matrix.os[0] == 'ubuntu-latest'
       run: |
         sudo apt-get update
-        sudo apt-get -y install gettext texinfo bison flex libncurses5-dev libgmp3-dev libmpfr-dev libmpc-dev
+        sudo apt-get -y install texinfo bison flex gettext libgmp3-dev libmpfr-dev libmpc-dev
 
     - name: Install on Mac
-      if: startsWith( matrix.os[0], 'macOS' )
+      if: matrix.os[0] == 'macos-latest'
       run: |
         brew update
-        brew install gettext texinfo bison flex gnu-sed gsl gmp mpfr
     
+        brew install texinfo bison flex gnu-sed gsl gmp mpfr libmpc
     - name: Install in MSYS2
       if: matrix.os[0] == 'windows-latest'
       uses: msys2/setup-msys2@v2
       with:
         msystem: MINGW32
-        install: base-devel git make texinfo flex bison patch binutils mingw-w64-i686-gcc mingw-w64-i686-dlfcn mingw-w64-i686-mpc
+        install: |
+          base-devel git make texinfo flex bison patch binutils mingw-w64-i686-gcc mpc-devel tar
+          mingw-w64-i686-cmake mingw-w64-i686-make mingw-w64-i686-libogg
         update: true
 
     - name: Runs all stages

diff --git a/scripts/002-gcc-stage1.sh b/scripts/002-gcc-stage1.sh
@@ -33,14 +33,6 @@ fi
 cd "$REPO_FOLDER"
 
 TARGET="psp"
-OSVER=$(uname)
-
-## Apple needs to pretend to be linux
-if [ ${OSVER:0:6} == Darwin ]; then
-	TARG_XTRA_OPTS="--build=i386-linux-gnu --host=i386-linux-gnu"
-else
-	TARG_XTRA_OPTS=""
-fi
 
 ## Determine the maximum number of processes that Make can work with.
 PROC_NR=$(getconf _NPROCESSORS_ONLN)

diff --git a/scripts/005-gcc-stage2.sh b/scripts/005-gcc-stage2.sh
@@ -33,14 +33,6 @@ fi
 cd "$REPO_FOLDER"
 
 TARGET="psp"
-OSVER=$(uname)
-
-## Apple needs to pretend to be linux
-if [ ${OSVER:0:6} == Darwin ]; then
-	TARG_XTRA_OPTS="--build=i386-linux-gnu --host=i386-linux-gnu"
-else
-	TARG_XTRA_OPTS=""
-fi
 
 ## Determine the maximum number of processes that Make can work with.
 PROC_NR=$(getconf _NPROCESSORS_ONLN)
@@ -59,7 +51,7 @@ rm -rf build-$TARGET-stage2 && mkdir build-$TARGET-stage2 && cd build-$TARGET-st
   --disable-libssp \
   --disable-multilib \
   --enable-threads=posix \
-  --disable-libstdcxx-pch \
+  MAKEINFO=missing \
   $TARG_XTRA_OPTS || { exit 1; }
 
 ## Compile and install.