Mercurial > octave
changeset 29919:4559cdcc4562
GitHub-CI: Remove obsolete hack in MSYS2 rules for error fixed upstream.
* .github/workflows/make.yaml (windows): No longer override PORTAUDIO_LIBS in
"make" step. PortAudio was updated to 19.7.0 in MSYS2 which makes this hack
obsolete.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 25 Jul 2021 16:28:44 +0200 |
| parents | 8c7685d70cf3 |
| children | 12d77b69df12 |
| files | .github/workflows/make.yaml |
| diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.github/workflows/make.yaml Sun Jul 25 20:25:47 2021 +0200 +++ b/.github/workflows/make.yaml Sun Jul 25 16:28:44 2021 +0200 @@ -386,7 +386,6 @@ # configure sometimes hangs while compiling 32bit Fortran. # It should take much less than 30 minutes. Cancel the step if it takes longer. timeout-minutes: 30 - # PortAudio requires linking to libuuid. But its pkg-config file doesn't reference the path to that library. # FIXME: Fix building with Java support. Override JAVA_HOME for now. # FIXME: How do we get a working TeX environment in MSYS2? Disable building the documentation for now. # Linking with ncurses fails. Use termcap library instead. @@ -410,12 +409,9 @@ # Spawning processes seems to have a big overhead on this platform. Use a somewhat larger number of parallel processes to compensate for that. # MSYS2's "fltk-config" returns wrong LIBS. Override them for make. # See: https://github.com/msys2/MINGW-packages/issues/8806 - # MSYS2's "portaudio" doesn't depend on uuid. But its package-config file still contains "-luuid". Override the flags for make. - # See: https://github.com/msys2/MINGW-packages/issues/8805 run: | make -C ./.build all -j8 V=1 \ - FLTK_LIBS="-lfltk_gl -lopengl32 -lglu32 -lfltk -lpthread" \ - PORTAUDIO_LIBS="-lportaudio -ldsound -lsetupapi -lwinmm -lm -lole32" + FLTK_LIBS="-lfltk_gl -lopengl32 -lglu32 -lfltk -lpthread" - name: ccache status continue-on-error: true