strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add --with-system-frozen

Browse source 
Change-Id: Ia09254cab5696fa0a3530fcafa5b48acca631ff2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153208
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Rene Engelhard 2023-06-17 14:38:27 +02:00 committed by Tomaž Vajngerl
parent dc03f59374
commit cd9afc213d
4 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
RepositoryExternal.mk
View file

@ -4298,6 +4298,14 @@ endif # ENABLE_ZXING
endif # SYSTEM_ZXING
ifneq ($(SYSTEM_FROZEN),)
define gb_LinkTarget__use_frozen
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(FROZEN_CFLAGS)
)
endef
else
define gb_LinkTarget__use_frozen
$(call gb_LinkTarget_use_unpacked,$(1),frozen)
$(call gb_LinkTarget_set_include,$(1),\
@ -4305,6 +4313,6 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
endef
endif
# vim: set noet sw=4 ts=4:

2
config_host.mk.in
View file

@ -134,6 +134,7 @@ export DOCDIR=@DOCDIR@
export DOXYGEN=@DOXYGEN@
export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
export DRAGONBOX_CFLAGS=@DRAGONBOX_CFLAGS@
export FROZEN_CFLAGS=@FROZEN_CFLAGS@
export DPKG=@DPKG@
export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
@ -158,6 +159,7 @@ export ENABLE_DBUS=@ENABLE_DBUS@
export ENABLE_DCONF=@ENABLE_DCONF@
export ENABLE_DEBUG=@ENABLE_DEBUG@
SYSTEM_DRAGONBOX=@SYSTEM_DRAGONBOX@
SYSTEM_FROZEN=@SYSTEM_FROZEN@
export ENABLE_EPOXY=@ENABLE_EPOXY@
export ENABLE_EOT=@ENABLE_EOT@
export ENABLE_EVOAB2=@ENABLE_EVOAB2@

26
configure.ac
View file

@ -2452,6 +2452,11 @@ AC_ARG_WITH(system-dragonbox,
[Use dragonbox already on system.]),,
[with_system_dragonbox="$with_system_headers"])
AC_ARG_WITH(system-frozen,
AS_HELP_STRING([--with-system-frozen],
[Use frozen already on system.]),,
[with_system_frozen="$with_system_headers"])
AC_ARG_WITH(system-libfixmath,
AS_HELP_STRING([--with-system-libfixmath],
[Use libfixmath already on system.]),,
@ -10542,6 +10547,27 @@ fi
AC_SUBST([SYSTEM_DRAGONBOX])
AC_SUBST([DRAGONBOX_CFLAGS])
dnl ===================================================================
dnl Check for system frozen
dnl ===================================================================
AC_MSG_CHECKING([which frozen to use])
if test "$with_system_frozen" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_FROZEN=TRUE
AC_LANG_PUSH([C++])
save_CPPFLAGS=$CPPFLAGS
AC_CHECK_HEADER([frozen/unordered_map.h], [],
[AC_MSG_ERROR([frozen/unordered_map.h not found. install frozen headers])], [])
AC_LANG_POP([C++])
CPPFLAGS=$save_CPPFLAGS
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE FROZEN"
SYSTEM_FROZEN=
fi
AC_SUBST([SYSTEM_FROZEN])
AC_SUBST([FROZEN_CFLAGS])
dnl ===================================================================
dnl Check for system libfixmath
dnl ===================================================================

2
external/Module_external.mk vendored
View file

@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
$(call gb_Helper_optional,FREEHAND,libfreehand) \
$(call gb_Helper_optional,FREETYPE,freetype) \
frozen \
$(call gb_Helper_optional,FROZEN,frozen) \
$(call gb_Helper_optional,GLM,glm) \
$(call gb_Helper_optional,GPGMEPP,gpgmepp) \
$(call gb_Helper_optional,GRAPHITE,graphite) \