diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-06-11 13:02:29 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-06-11 13:25:58 +0200 |
| commit | 23f9afdce0ff244481345171cdff54fe807a212e (patch) | |
| tree | 6b8f24413aedfc565f1602e90a67cd20f9d6c27a /external/coinmp | |
| parent | iOS, updated configure.ac to allow native armv7 and arm64 (diff) | |
| download | core-23f9afdce0ff244481345171cdff54fe807a212e.tar.gz core-23f9afdce0ff244481345171cdff54fe807a212e.zip | |
iOS, solved coinmp buildbreaker
Patch was added in wrong sequence.
Change-Id: I4d700d0f9591dbb43c738ef69f823488b9c3162c
Diffstat (limited to 'external/coinmp')
| -rw-r--r-- | external/coinmp/iOS.patch.1 | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/external/coinmp/iOS.patch.1 b/external/coinmp/iOS.patch.1 index 740156a11ec8..a61004b488a2 100644 --- a/external/coinmp/iOS.patch.1 +++ b/external/coinmp/iOS.patch.1 @@ -169,21 +169,12 @@ diff -ur CoinMP.org/Osi/config.sub CoinMP/Osi/config.sub diff -ur CoinMP.org/config.sub CoinMP/config.sub --- CoinMP.org/config.sub 2013-11-21 05:36:29.000000000 +0100 +++ CoinMP/config.sub 2017-06-11 12:07:15.000000000 +0200 -@@ -120,7 +120,7 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os @@ -241,7 +241,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 | arm64 \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -196,12 +187,4 @@ diff -ur CoinMP.org/config.sub CoinMP/config.sub | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -@@ -1218,7 +1218,7 @@ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + |