Kaydet (Commit) 2c5f8927 authored tarafından Peter Foley's avatar Peter Foley Kaydeden (comit) jan iversen

Android autoconf fixes

Change-Id: I3429f6a80dd7e080e8f2634ca744d1dac5ea1865
Reviewed-on: https://gerrit.libreoffice.org/21558Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarjan iversen <jani@documentfoundation.org>
üst 6f2b0b5d
...@@ -54,7 +54,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : ...@@ -54,7 +54,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
--disable-valgrind \ --disable-valgrind \
$(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \ $(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \
--disable-svg --enable-gtk-doc=no --enable-test-surfaces=no \ --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) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
&& cp cairo-version.h src/cairo-version.h \ && cp cairo-version.h src/cairo-version.h \
&& cd src && $(MAKE) \ && cd src && $(MAKE) \
......
...@@ -34,7 +34,8 @@ $(call gb_ExternalProject_get_state_target,pixman,build) : ...@@ -34,7 +34,8 @@ $(call gb_ExternalProject_get_state_target,pixman,build) :
./configure \ ./configure \
$(if $(filter MACOSX IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter MACOSX IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
$(if $(filter ANDROID,$(OS)),--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt) \ $(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) \ && $(MAKE) \
) )
......
...@@ -16,7 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,expat,\ ...@@ -16,7 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,expat,\
$(call gb_ExternalProject_get_state_target,expat,configure) : $(call gb_ExternalProject_get_state_target,expat,configure) :
$(call gb_ExternalProject_run,configure,\ $(call gb_ExternalProject_run,configure,\
./configure \ ./configure \
$(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)) \
,,expat_configure.log) ,,expat_configure.log)
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -26,7 +26,8 @@ else ...@@ -26,7 +26,8 @@ else
$(call gb_ExternalProject_get_state_target,lcms2,build): $(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
./configure --without-jpeg --without-tiff --with-pic \ ./configure --without-jpeg --without-tiff --with-pic \
$(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)) \
CPPFLAGS=" $(SOLARINC)" \ CPPFLAGS=" $(SOLARINC)" \
CFLAGS='$(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))' \ CFLAGS='$(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))' \
$(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \ $(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \
......
...@@ -45,7 +45,8 @@ $(call gb_ExternalProject_get_state_target,raptor,build): ...@@ -45,7 +45,8 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
--with-www=xml \ --with-www=xml \
--without-xslt-config \ --without-xslt-config \
$(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)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(DISABLE_DYNLOADING), \ $(if $(DISABLE_DYNLOADING), \
--enable-static --disable-shared \ --enable-static --disable-shared \
......
...@@ -54,7 +54,8 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): ...@@ -54,7 +54,8 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
--with-decimal=none \ --with-decimal=none \
--with-uuid-library=internal \ --with-uuid-library=internal \
--with-digest-library=internal \ --with-digest-library=internal \
$(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)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(DISABLE_DYNLOADING), \ $(if $(DISABLE_DYNLOADING), \
--enable-static --disable-shared \ --enable-static --disable-shared \
......
...@@ -58,7 +58,8 @@ $(call gb_ExternalProject_get_state_target,redland,build): ...@@ -58,7 +58,8 @@ $(call gb_ExternalProject_get_state_target,redland,build):
--without-threads \ --without-threads \
--without-bdb --without-sqlite --without-mysql \ --without-bdb --without-sqlite --without-mysql \
--without-postgresql --without-threestone --without-virtuoso \ --without-postgresql --without-threestone --without-virtuoso \
$(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)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(DISABLE_DYNLOADING), \ $(if $(DISABLE_DYNLOADING), \
--enable-static --disable-shared \ --enable-static --disable-shared \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment