Kaydet (Commit) d729d169 authored tarafından Michael Stahl's avatar Michael Stahl

normalize values of CROSS_COMPILING

Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
üst 8827b08d
......@@ -60,7 +60,7 @@ $(call fetch__Download_item,$1,$($2),$($(subst _TARBALL,_MD5SUM,$(2))))
endef
fetch_BUILD_TYPE := $(sort $(BUILD_TYPE))
ifeq ($(CROSS_COMPILING),YES)
ifneq ($(CROSS_COMPILING),)
fetch_BUILD_TYPE := $(sort $(fetch_BUILD_TYPE) $(shell . $(SRCDIR)/bin/get_config_variables --build BUILD_TYPE && echo $$BUILD_TYPE))
endif
......
......@@ -136,7 +136,7 @@ clean-host:
rm -fr install
clean-build:
ifeq ($(CROSS_COMPILING),YES)
ifneq ($(CROSS_COMPILING),)
rm -fr $(INSTDIR_FOR_BUILD)
rm -fr $(WORKDIR_FOR_BUILD)
endif
......
......@@ -403,7 +403,7 @@ Then create pkg-config wrapper, something like:
$ cat > pkg-config-wrapper-host << _EOF
#!/bin/sh
if [ "$CROSS_COMPILING" = YES ]; then
if [ "$CROSS_COMPILING" = TRUE ]; then
SYSROOT=$HOME/lo/raspbian-root
export PKG_CONFIG_PATH=${SYSROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig:${SYSROOT}/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=${SYSROOT}/usr/lib/pkgconfig
......
......@@ -3263,7 +3263,7 @@ AC_SUBST(DISABLE_ACTIVEX)
AC_SUBST(DISABLE_ATL)
if test "$cross_compiling" = "yes"; then
export CROSS_COMPILING=YES
export CROSS_COMPILING=TRUE
SCPDEFS="$SCPDEFS -DCROSS_COMPILING"
else
CROSS_COMPILING=
......@@ -5748,7 +5748,7 @@ using namespace std;
if test -n "$MINGW_GXXDLL"; then
mingw_gxxdll_root=${MINGW_GXXDLL%.dll}
mingw_gxxdll_root=${mingw_gxxdll_root#lib}
if test "$CROSS_COMPILING" = "YES"; then
if test "$CROSS_COMPILING" = "TRUE"; then
dnl m4 escaping!
mingw_gxxdll_root=${mingw_gxxdll_root%-[[0-9]]}
fi
......@@ -7951,7 +7951,7 @@ case $enable_python in
system)
SYSTEM_PYTHON=TRUE
if test "$CROSS_COMPILING" != YES; then
if test "$CROSS_COMPILING" != TRUE; then
dnl Check if the headers really work
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
......@@ -12623,7 +12623,7 @@ AC_CONFIG_HEADERS([config_host/config_version.h])
AC_CONFIG_HEADERS([config_host/config_oauth2.h])
AC_OUTPUT
if test "$CROSS_COMPILING" = YES; then
if test "$CROSS_COMPILING" = TRUE; then
(echo; echo export BUILD_TYPE_FOR_HOST=$BUILD_TYPE) >>config_build.mk
fi
......@@ -12679,7 +12679,7 @@ $GNUMAKE help
_EOF
if test $_os != WINNT -a "$CROSS_COMPILING" != YES; then
if test $_os != WINNT -a "$CROSS_COMPILING" != TRUE; then
cat << _EOF
After the build has finished, your can immediately run it using:
instdir/program/soffice
......
......@@ -46,7 +46,7 @@ $(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 $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
&& cp cairo-version.h src/cairo-version.h \
&& cd src && $(MAKE) \
......
......@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,pixman,build) :
./configure \
$(if $(filter MACOSX IOS,$(OS)),--disable-shared,--disable-static) \
$(if $(filter ANDROID,$(OS)),--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
......
......@@ -49,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
--disable-doxygen \
--disable-html-docs \
--disable-latex-docs \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \
$(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
$(if $(filter SOLARIS,$(OS)),LIBS="-lm") \
......
......@@ -47,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
......
......@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,epm))
ifneq ($(CROSS_COMPILING),YES)
ifeq ($(CROSS_COMPILING),)
$(eval $(call gb_Module_add_targets,epm,\
ExternalProject_epm \
......
......@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,expat,\
$(call gb_ExternalProject_get_state_target,expat,configure) :
$(call gb_ExternalProject_run,configure,\
./configure \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
,,expat_configure.log)
# vim: set noet sw=4 ts=4:
......@@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--disable-superserver \
--with-system-icu --without-fbsample --without-fbsample-db \
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
&& $(if $(filter WNT,$(OS)),\
PATH="$(shell cygpath -u $(call gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
......
......@@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
--with-freetype=no \
--with-cairo=no \
--with-glib=no \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \
)
......
......@@ -17,7 +17,7 @@ $(call gb_ExternalProject_get_state_target,hunspell,build):
$(call gb_ExternalProject_run,build,\
LIBS="$(gb_STDLIBS) $(LIBS)" \
./configure --disable-shared --disable-nls --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
$(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
$(if $(filter C53,$(COM)),CFLAGS="-xc99=none") \
$(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \
......
......@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,hyphen,build):
$(call gb_ExternalProject_run,build,\
./configure --disable-shared \
$(if $(filter-out IOS,$(OS)),--with-pic) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
&& $(MAKE) \
)
......
......@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
LDFLAGS="-L$(COMPATH)/lib -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 \
$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
./configure \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \
--disable-layout --disable-static --enable-shared --disable-samples \
&& $(MAKE) \
......@@ -83,7 +83,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),\
--enable-static --disable-shared,\
--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source)\
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
......
......@@ -26,7 +26,7 @@ else
$(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\
./configure --without-jpeg --without-tiff --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CPPFLAGS=" $(SOLARINC)" \
$(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \
$(if $(filter IOS ANDROID,$(OS)), --disable-shared --enable-static, --enable-shared --disable-static) \
......
......@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
$(MAKE)) \
......
......@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,libatomic_ops,build) :
$(call gb_ExternalProject_run,build,\
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \
./configure \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
......
......@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-werror \
--disable-weffc \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
$(MAKE)) \
......
......@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& cd src/lib \
&& $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \
)
......
......@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \
)
......
......@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,exttextcat,\
$(call gb_ExternalProject_get_state_target,exttextcat,build):
$(call gb_ExternalProject_run,build,\
./configure --disable-shared --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_DEBUG_CFLAGS) $(gb_COMPILEROPTFLAGS) \
$(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \
&& $(MAKE) \
......
......@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
$(MAKE)) \
......
......@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \
$(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \
$(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
$(if $(SYSTEM_LIBXML),\
$(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)"), \
LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \
......
......@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
--disable-werror \
--disable-weffc \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
$(MAKE)) \
......
......@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
--disable-debug \
--disable-werror \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
$(MAKE)) \
......
......@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
--disable-werror \
--disable-weffc \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src && \
$(if $(VERBOSE)$(verbose),V=1) \
$(MAKE)) \
......
......@@ -95,7 +95,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-spreadsheet-model \
--disable-werror \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(SYSTEM_BOOST),,--with-boost-system=boostsystem) \
&& $(if $(VERBOSE)$(verbose),V=1) \
$(MAKE) \
......
......@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
--disable-werror \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
$(MAKE)) \
......
......@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
--without-docs \
--disable-debug \
$(if $(filter MACOSX,$(OS)),--disable-werror) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(if $(VERBOSE)$(verbose),V=1) \
$(MAKE) \
)
......
......@@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) :
--without-docs \
--disable-debug \
--disable-werror \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
$(MAKE)) \
......
......@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
--disable-debug \
--disable-werror \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
$(MAKE)) \
......
......@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
./configure --disable-ipv6 --without-python --without-zlib \
--without-lzma \
--disable-static --without-debug lt_cv_cc_dll_switch="-shared" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LIBS="-lws2_32 $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
......@@ -42,7 +42,7 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
./configure --disable-ipv6 --without-python --without-zlib --with-sax1 \
--without-lzma \
$(if $(debug),--with-run-debug) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \
LDFLAGS="$(if $(SYSBASE),-L$(SYSBASE)/usr/lib)" \
CFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(if $(debug),-g)" \
......
......@@ -58,7 +58,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(if $(or $(filter-out ANDROID,$(OS)),$(DISABLE_OPENSSL)),--without-openssl,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(SYSTEM_LIBXML),,LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")\
$(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \
LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)) \
......
......@@ -19,7 +19,7 @@ ifeq ($(COM),GCC)
$(call gb_ExternalProject_get_state_target,xslt,build):
$(call gb_ExternalProject_run,build,\
./configure --without-crypto --without-python --disable-static \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
......@@ -42,7 +42,7 @@ else # OS!=WNT
$(call gb_ExternalProject_get_state_target,xslt,build):
$(call gb_ExternalProject_run,build,\
./configure --without-crypto --without-python \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
$(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
......
......@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,mythes,\
$(call gb_ExternalProject_get_state_target,mythes,build):
$(call gb_ExternalProject_run,build,\
LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
&& $(MAKE) \
)
......
......@@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
$(call gb_ExternalProject_run,configure,\
$(if $(filter MSC,$(COM)),LIB="$(ILIB)") \
nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
,,nss_configure.log)
......@@ -62,7 +62,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
$(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
$(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,NSS_USE_SYSTEM_SQLITE=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(filter YES,$(CROSS_COMPILING)),\
$(if $(CROSS_COMPILING),\
$(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \
NSDISTMODE=copy \
......
......@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
--without-cyrus-sasl \
--disable-shared \
--enable-static \
$(if $(filter YES,$(CROSS_COMPILING)), \
$(if $(CROSS_COMPILING), \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
--with-yielding_select=yes \
ac_cv_func_memcmp_working=yes \
......
......@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,poppler,build) :
--disable-utils \
--disable-cms \
$(if $(filter WNT MACOSX,$(OS)),--with-font-configuration=win32,--with-font-configuration=fontconfig) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
......
......@@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_ExternalProject_run,build,\
./configure \
--without-readline --disable-shared --with-ldap \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(DISABLE_OPENSSL),,--with-openssl \
$(if $(filter YES,$(WITH_KRB5)), --with-krb5) \
$(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi)) \
......
......@@ -59,7 +59,7 @@ endif
$(call gb_ExternalProject_get_state_target,python3,build) :
$(call gb_ExternalProject_run,build,\
./configure \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(ENABLE_VALGRIND),--with-valgrind) \
--prefix=/python-inst \
$(if $(filter MACOSX,$(OS)),,--with-system-expat) \
......
......@@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
--with-www=xml \
--without-xslt-config \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
......
......@@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
--with-decimal=none \
--with-uuid-library=internal \
--with-digest-library=internal \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
......
......@@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
--without-threads \
--without-bdb --without-sqlite --without-mysql \
--without-postgresql --without-threestone --without-virtuoso \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
&& $(MAKE) \
......
......@@ -22,7 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
$(if $(filter-out WNT,$(OS)),external/redland/rasqal/rasqal-bundled-soname.patch.1) \
$(if $(filter ANDROID,$(OS)),external/redland/rasqal/rasqal-android.patch.1) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/rasqal/rasqal-mingw.patch.1) \
$(if $(filter YES,$(CROSS_COMPILING)),external/redland/rasqal/rasqal-xcompile.patch.1) \
$(if $(CROSS_COMPILING),external/redland/rasqal/rasqal-xcompile.patch.1) \
))
# vim: set noet sw=4 ts=4:
......@@ -22,7 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,redland,\
$(if $(filter-out WNT,$(OS)),external/redland/redland/redland-bundled-soname.patch.1) \
$(if $(filter ANDROID,$(OS)),external/redland/redland/redland-android.patch.1) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/redland/redland-mingw.patch.1) \
$(if $(filter YES,$(CROSS_COMPILING)),external/redland/redland/redland-xcompile.patch.1) \
$(if $(CROSS_COMPILING),external/redland/redland/redland-xcompile.patch.1) \
))
# vim: set noet sw=4 ts=4:
......@@ -189,7 +189,7 @@ sub run {
# Checking version of makecab.exe
##############################################
if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) || $ENV{'CROSS_COMPILING'} ne 'YES' || $installer::globals::packageformat eq 'msi')) { installer::control::check_makecab_version(); }
if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) || $ENV{'CROSS_COMPILING'} ne 'TRUE' || $installer::globals::packageformat eq 'msi')) { installer::control::check_makecab_version(); }
##########################################################
# Getting the include path from the settings in zip list
......
......@@ -70,7 +70,7 @@ sub check_system_path
# All platforms: zip
# Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging
if ($ENV{'CROSS_COMPILING'} eq 'YES')
if ($ENV{'CROSS_COMPILING'} eq 'TRUE')
{
# we build our own msi* etc. tools when cross-compiling
$ENV{'PATH'} .= $installer::globals::pathseparator . $ENV{'WORKDIR_FOR_BUILD'} . '/LinkTarget/Executable';
......
......@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
ifeq ($(CROSS_COMPILING),YES)
ifneq ($(CROSS_COMPILING),)
gb_Module_add_targets_for_build :=
gb_Module_SKIPTARGETS := check slowcheck subsequentcheck
endif
......
......@@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_l10n_targets,svtools,\
UIConfig_svt \
))
ifneq ($(CROSS_COMPILING),YES)
ifeq ($(CROSS_COMPILING),)
ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,svtools,\
......
......@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,testtools))
ifneq ($(CROSS_COMPILING),YES)
ifeq ($(CROSS_COMPILING),)
$(eval $(call gb_Module_add_targets,testtools,\
CustomTarget_bridgetest \
......
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