diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | external/libxslt/UnpackedTarball_libxslt.mk | 1 | ||||
| -rw-r--r-- | external/libxslt/iOS.patch.0 | 20 | ||||
| -rwxr-xr-x | solenv/gbuild/config.sub | 4 |
4 files changed, 24 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 057c5ef2db26..396d02b88296 100644 --- a/configure.ac +++ b/configure.ac @@ -630,7 +630,7 @@ darwin*) # Mac OS X or iOS test_cups=no enable_mpl_subset=yes enable_lotuswordpro=no - enable_coinmp=yes + enable_coinmp=no enable_lpsolve=no enable_postgresql_sdbc=no enable_extension_integration=no diff --git a/external/libxslt/UnpackedTarball_libxslt.mk b/external/libxslt/UnpackedTarball_libxslt.mk index eae318ef74b9..27be0ca3dccb 100644 --- a/external/libxslt/UnpackedTarball_libxslt.mk +++ b/external/libxslt/UnpackedTarball_libxslt.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxslt,\ external/libxslt/libxslt-msvc.patch.2 \ external/libxslt/libxslt-1.1.26-memdump.patch \ external/libxslt/rpath.patch.0 \ + external/libxslt/iOS.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libxslt/iOS.patch.0 b/external/libxslt/iOS.patch.0 new file mode 100644 index 000000000000..ffd4a39a815a --- /dev/null +++ b/external/libxslt/iOS.patch.0 @@ -0,0 +1,20 @@ +--- config.sub ++++ config.sub +@@ -253,7 +253,7 @@ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ +- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ ++ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \ + | avr | avr32 \ + | be32 | be64 \ + | bfin \ +@@ -374,7 +374,7 @@ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ +- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ diff --git a/solenv/gbuild/config.sub b/solenv/gbuild/config.sub index 932128b337ee..d85ddaa5ae33 100755 --- a/solenv/gbuild/config.sub +++ b/solenv/gbuild/config.sub @@ -252,7 +252,7 @@ case $basic_machine in | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \ | avr | avr32 \ | ba \ | be32 | be64 \ @@ -376,7 +376,7 @@ case $basic_machine in | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \ | avr-* | avr32-* \ | ba-* \ | be32-* | be64-* \ |