zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-11 05:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update libffi in Android CI pipeline

Browse source
This commit is contained in:
derselbst 2021-12-20 18:58:14 +01:00
parent 76639ecf33
commit a173da91da
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.azure/azure-pipelines-android.yml
View file

@ -33,7 +33,7 @@ schedules:
variables: variables:
ICONV_VERSION: '1.16' ICONV_VERSION: '1.16'
# Use recent master libffi, because 3.3 is broken: checking host system type... Invalid configuration `arm-none-linux-eabi': machine `arm-none-linux' not recognized # Use recent master libffi, because 3.3 is broken: checking host system type... Invalid configuration `arm-none-linux-eabi': machine `arm-none-linux' not recognized
FFI_VERSION: 'dd5bd03075149d7cf8441875c1a344e8beb57dde' FFI_VERSION: '3.4.2'
GETTEXT_VERSION: '0.21' GETTEXT_VERSION: '0.21'
#need to switch to meson build system to use a more recent version #need to switch to meson build system to use a more recent version
GLIB_VERSION: '2.58' GLIB_VERSION: '2.58'
@ -136,7 +136,7 @@ jobs:
wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz
tar zxf libiconv-${ICONV_VERSION}.tar.gz tar zxf libiconv-${ICONV_VERSION}.tar.gz
wget -O libffi-${FFI_VERSION}.tar.gz https://github.com/libffi/libffi/archive/${FFI_VERSION}.tar.gz wget -O libffi-${FFI_VERSION}.tar.gz https://github.com/libffi/libffi/releases/download/v${FFI_VERSION}/libffi-${FFI_VERSION}.tar.gz
tar zxf libffi-${FFI_VERSION}.tar.gz tar zxf libffi-${FFI_VERSION}.tar.gz
wget http://ftp.gnu.org/pub/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz wget http://ftp.gnu.org/pub/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz
@ -561,7 +561,7 @@ jobs:
- script: | - script: |
ls -Rg $(PREFIX) ls -Rg $(PREFIX)
displayName: 'Show cross-compiled files in $(PREFIX)' displayName: 'Show cross-compiled files in $(PREFIX)'
condition: always() condition: or(succeeded(), failed())
- script: | - script: |
set -ex set -ex

4
.azure/cmake-android.yml
View file

@ -11,7 +11,7 @@ parameters:
default: $(DEV) default: $(DEV)
- name: condition - name: condition
type: string type: string
default: ne(variables.CACHE_RESTORED, 'true') default: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
- name: installCommand - name: installCommand
type: string type: string
default: 'make install' default: 'make install'
@ -63,5 +63,5 @@ steps:
cat ${{ parameters.sourceDir }}/build/CMakeFiles/CMakeOutput.log cat ${{ parameters.sourceDir }}/build/CMakeFiles/CMakeOutput.log
true true
displayName: 'Print ${{ parameters.sourceDir }} Cmake Error Log' displayName: 'Print ${{ parameters.sourceDir }} Cmake Error Log'
condition: or(succeeded(), failed()) condition: or(${{ parameters.condition }}, failed())
workingDirectory: ${{ parameters.workDir }} workingDirectory: ${{ parameters.workDir }}