diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2016-01-17 19:22:51 -0500 |
|---|---|---|
| committer | jan iversen <jani@documentfoundation.org> | 2016-01-29 10:23:51 +0000 |
| commit | 2c5f8927349cf0e643e0bfebf4d9aa5b726b0f89 (patch) | |
| tree | aff3cd7ec071d8e00319c1d17b53b2369cff2237 /external/cairo | |
| parent | 6f2b0b5de3a99b029b61079bd9a9c313305d0e12 (diff) | |
Android autoconf fixes
Change-Id: I3429f6a80dd7e080e8f2634ca744d1dac5ea1865
Reviewed-on: https://gerrit.libreoffice.org/21558
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'external/cairo')
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 3 | ||||
| -rw-r--r-- | external/cairo/ExternalProject_pixman.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index ca54bfc4efee..e74f5f0719d8 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -54,7 +54,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : --disable-valgrind \ $(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \ --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no ax_cv_c_float_words_bigendian=no)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && cp cairo-version.h src/cairo-version.h \ && cd src && $(MAKE) \ diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk index bbb4081420b0..083b0b6094e8 100644 --- a/external/cairo/ExternalProject_pixman.mk +++ b/external/cairo/ExternalProject_pixman.mk @@ -34,7 +34,8 @@ $(call gb_ExternalProject_get_state_target,pixman,build) : ./configure \ $(if $(filter MACOSX IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID,$(OS)),--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt) \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ && $(MAKE) \ ) |