summaryrefslogtreecommitdiffstats
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk316
1 files changed, 254 insertions, 62 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dc9276a40641..60499758de40 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -312,6 +312,7 @@ $(call gb_LinkTarget_use_system_win32_libs,$(1),\
kernel32 \
shlwapi \
crypt32 \
+ bcrypt \
)
endef
@@ -1213,8 +1214,11 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \
- -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \
+ $(if $(filter EMSCRIPTEN,$(OS)), \
+ $(call gb_UnpackedTarball_get_dir,cairo)/src/.libs/libcairo.a \
+ $(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs/libpixman-1.a, \
+ -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \
+ -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1) \
)
endef
@@ -1281,8 +1285,20 @@ gb_ExternalProject__use_fontconfig :=
else # SYSTEM_FONTCONFIG
+ifneq ($(filter-out MACOSX WNT,$(OS)),)
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ fontconfig \
+))
+
+endif
+
define gb_LinkTarget__use_fontconfig
+ifeq ($(OS),LINUX)
+$(call gb_LinkTarget_use_package,$(1),fontconfig)
+else
$(call gb_LinkTarget_use_external_project,$(1),fontconfig)
+endif
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,fontconfig) \
$$(INCLUDE) \
@@ -1537,6 +1553,35 @@ endif # SYSTEM_OPENSSL
endif # ENABLE_OPENSSL
+ifneq ($(SYSTEM_ARGON2),)
+
+define gb_LinkTarget__use_argon2
+$(call gb_LinkTarget_set_include,$(1),\
+ $(ARGON2_CFLAGS) \
+ $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(ARGON2_LIBS))
+
+endef
+
+else # !SYSTEM_ARGON2
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+ argon2 \
+))
+
+define gb_LinkTarget__use_argon2
+$(call gb_LinkTarget_set_include,$(1),\
+ $(ARGON2_CFLAGS) \
+ $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(ARGON2_LIBS))
+$(call gb_LinkTarget_use_package,$(1),argon2)
+endef
+
+endif # SYSTEM_ARGON2
+
+
ifneq ($(SYSTEM_CDR),)
define gb_LinkTarget__use_cdr
@@ -2607,6 +2652,103 @@ endef
endif # !SYSTEM_LIBPNG
+ifneq ($(SYSTEM_LIBTIFF),)
+
+define gb_LinkTarget__use_libtiff
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(LIBTIFF_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(LIBTIFF_LIBS) \
+)
+
+endef
+
+gb_ExternalProject__use_libtiff :=
+
+else # !SYSTEM_LIBTIFF
+
+define gb_LinkTarget__use_libtiff
+$(call gb_LinkTarget_set_include,$(1),\
+ $(LIBTIFF_CFLAGS) \
+ $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,libtiff)/libtiff \
+ $$(INCLUDE) \
+)
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(call gb_UnpackedTarball_get_dir,libtiff)/libtiff/.libs/libtiff$(gb_StaticLibrary_PLAINEXT) \
+)
+else
+$(call gb_LinkTarget_add_libs,$(1),\
+ -L$(call gb_UnpackedTarball_get_dir,libtiff)/libtiff/.libs -ltiff \
+)
+endif
+$(call gb_LinkTarget_use_external_project,$(1),libtiff,full)
+
+endef
+
+define gb_ExternalProject__use_libtiff
+$(call gb_ExternalProject_use_external_project,$(1),libtiff)
+
+endef
+
+endif # !SYSTEM_LIBTIFF
+
+ifneq ($(SYSTEM_LIBWEBP),)
+
+define gb_LinkTarget__use_libwebp
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(LIBWEBP_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(LIBWEBP_LIBS) \
+)
+
+endef
+
+gb_ExternalProject__use_libwebp :=
+
+else # !SYSTEM_LIBWEBP
+
+define gb_LinkTarget__use_libwebp
+$(call gb_LinkTarget_set_include,$(1),\
+ $(LIBWEBP_CFLAGS) \
+ $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,libwebp)/src \
+ $$(INCLUDE) \
+)
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(call gb_UnpackedTarball_get_dir,libwebp)/output/lib/libwebp$(if $(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT) \
+)
+else
+$(call gb_LinkTarget_add_libs,$(1),\
+ -L$(call gb_UnpackedTarball_get_dir,libwebp)/src/.libs -lwebp \
+ -L$(call gb_UnpackedTarball_get_dir,libwebp)/sharpyuv/.libs -lsharpyuv \
+)
+endif
+$(call gb_LinkTarget_use_external_project,$(1),libwebp)
+
+endef
+
+define gb_ExternalProject__use_libwebp
+$(call gb_ExternalProject_use_external_project,$(1),libwebp)
+
+endef
+
+endif # !SYSTEM_LIBWEBP
+
ifneq ($(SYSTEM_CURL),)
@@ -2624,9 +2766,10 @@ endef
else # !SYSTEM_CURL
+$(if $(ENABLE_CURL),\
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
curl \
-))
+)))
define gb_LinkTarget__use_curl
$(call gb_LinkTarget_use_package,$(1),curl)
@@ -2733,6 +2876,7 @@ ifneq ($(SYSTEM_CLUCENE),)
define gb_LinkTarget__use_clucene
$(call gb_LinkTarget_add_defs,$(1),\
$(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(CLUCENE_CFLAGS))) \
+ -DSYSTEM_CLUCENE \
)
$(call gb_LinkTarget_set_include,$(1),\
@@ -2943,9 +3087,10 @@ endef
else # !SYSTEM_POSTGRESQL
ifeq ($(OS),WNT)
+$(if $(MPL_SUBSET),,\
$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
postgresql \
-))
+)))
endif # WNT
define gb_LinkTarget__use_postgresql
@@ -2979,7 +3124,7 @@ endef # gb_LinkTarget__use_postgresql
endif # !SYSTEM_POSTGRESQL
-ifeq ($(ENABLE_KF5),TRUE)
+ifneq (,$(filter TRUE,$(ENABLE_KF5) $(ENABLE_GTK3_KDE5)))
define gb_LinkTarget__use_kf5
$(call gb_LinkTarget_set_include,$(1),\
@@ -3005,9 +3150,33 @@ endef
endif # ENABLE_KF5
+ifneq (,$(filter TRUE,$(ENABLE_KF6)))
+
+define gb_LinkTarget__use_kf6
+$(call gb_LinkTarget_set_include,$(1),\
+ $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(KF6_CFLAGS)))) \
+ $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_add_cxxflags,$(1),\
+ $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KF6_CFLAGS))) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(KF6_LIBS) \
+)
+
+endef
+
+else # !ENABLE_KF6
+
+define gb_LinkTarget__use_kf6
+
+endef
+endif # ENABLE_KF6
-ifeq ($(ENABLE_QT5),TRUE)
+ifneq (,$(filter TRUE,$(ENABLE_QT5) $(ENABLE_GTK3_KDE5)))
define gb_LinkTarget__use_qt5
$(call gb_LinkTarget_set_include,$(1),\
@@ -3113,14 +3282,14 @@ endif
ifeq ($(OS),WNT)
ifeq ($(CPUNAME),X86_64)
-python_arch_subdir=amd64
+python_arch_subdir=amd64/
else ifeq ($(CPUNAME),AARCH64)
-python_arch_subdir=arm64
+python_arch_subdir=arm64/
else
-python_arch_subdir=win32
+python_arch_subdir=win32/
endif
$(call gb_LinkTarget_add_libs,$(1),\
- $(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(python_arch_subdir)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
+ $(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
)
else ifeq ($(OS),MACOSX)
$(call gb_LinkTarget_add_libs,$(1),\
@@ -3206,7 +3375,7 @@ $(call gb_LinkTarget_set_include,$(1),\
)
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.17 \
+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.18 \
)
$(if $(SYSTEM_BOOST), \
@@ -3225,7 +3394,7 @@ $(call gb_LinkTarget_set_include,$(1),\
)
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.17 \
+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.18 \
)
endef
@@ -3234,9 +3403,9 @@ endif # MSC
endif # SYSTEM_LIBORCUS
+ifeq ($(ENABLE_EOT),TRUE)
-ifeq ($(ENABLE_LIBEOT),TRUE)
-ifeq ($(SYSTEM_LIBEOT),TRUE)
+ifneq ($(SYSTEM_LIBEOT),)
define gb_LinkTarget__use_libeot
$(call gb_LinkTarget_set_include,$(1),\
@@ -3268,14 +3437,16 @@ $(call gb_ExternalProject_use_external_project,$(1),libeot)
endef
-endif # !SYSTEM_LIBEOT
-else # !ENABLE_LIBEOT
+endif # SYSTEM_LIBEOT
+
+else # !ENABLE_EOT
gb_LinkTarget__use_libeot :=
gb_ExternalProject__use_libeot :=
-endif # !ENABLE_LIBEOT
+endif # ENABLE_EOT
+### X11 stuff ###
ifeq ($(USING_X11), TRUE)
@@ -3777,6 +3948,17 @@ endef
endif # SYSTEM_JFREEREPORT
+# no known distro packaged Java-Websocket at present
+
+ifeq ($(ENABLE_JAVA),TRUE)
+$(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
+ java_websocket \
+))
+endif
+
+define gb_Jar__use_java_websocket
+$(call gb_Jar_use_jar,$(1),java_websocket)
+endef
# Executables
@@ -3833,12 +4015,6 @@ endef
endif
-define gb_Executable__register_idlc
-$(call gb_Executable_add_runtime_dependencies,idlc,\
- $(call gb_ExternalExecutable_get_dependencies,ucpp) \
-)
-endef
-
define gb_Executable__register_localize
$(call gb_Executable_add_runtime_dependencies,localize,\
$(foreach exec,cfgex helpex propex treex ulfex xrmex,\
@@ -3909,19 +4085,6 @@ endef
endif # SYSTEM_LIBXSLT_FOR_BUILD
-ifneq (,$(SYSTEM_UCPP))
-
-gb_ExternalExecutable__register_ucpp :=
-
-else # ! SYSTEM_UCPP
-
-define gb_ExternalExecutable__register_ucpp
-$(call gb_ExternalExecutable_set_internal,ucpp,$(INSTDIR_FOR_BUILD)/$(SDKDIRNAME)/bin/ucpp$(gb_Executable_EXT_for_build))
-
-endef
-
-endif # SYSTEM_UCPP
-
ifeq (,$(PYTHON_FOR_BUILD))
define gb_ExternalExecutable__register_python
@@ -4017,7 +4180,6 @@ endef
endif
-ifneq ($(ENABLE_ONLINE_UPDATE_MAR),)
ifneq ($(SYSTEM_BZIP2),)
define gb_LinkTarget__use_bzip2
@@ -4056,8 +4218,7 @@ define gb_ExternalProject__use_bzip2
$(call gb_ExternalProject_use_external_project,$(1),bzip2)
endef
-endif
-endif
+endif # SYSTEM_BZIP2
define gb_LinkTarget__use_clew
$(call gb_LinkTarget_set_include,$(1), \
@@ -4081,6 +4242,27 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\
))
endif
+ifneq ($(SYSTEM_DRAGONBOX),)
+
+define gb_LinkTarget__use_dragonbox
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $$(DRAGONBOX_CFLAGS) \
+)
+endef
+
+else
+
+define gb_LinkTarget__use_dragonbox
+$(call gb_LinkTarget_use_unpacked,$(1),dragonbox)
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,dragonbox/include/)\
+ $$(INCLUDE) \
+)
+endef
+
+endif
+
define gb_LinkTarget__use_dtoa
$(call gb_LinkTarget_use_unpacked,$(1),dtoa)
$(call gb_LinkTarget_set_include,$(1),\
@@ -4121,7 +4303,7 @@ else # !SYSTEM_BOX2D
define gb_LinkTarget__use_box2d
$(call gb_LinkTarget_use_unpacked,$(1),box2d)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(call gb_UnpackedTarball_get_dir,box2d/Box2D/)\
+ -I$(call gb_UnpackedTarball_get_dir,box2d/include/)\
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
@@ -4137,6 +4319,30 @@ endef
endif # SYSTEM_BOX2D
+ifneq ($(SYSTEM_ZXCVBN),)
+define gb_LinkTarget__use_zxcvbn-c
+$(call gb_LinkTarget_set_include,$(1),\
+ -DSYSTEM_ZXCVBN \
+ $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),-lzxcvbn)
+endef
+
+else
+
+define gb_LinkTarget__use_zxcvbn-c
+$(call gb_LinkTarget_use_unpacked,$(1),zxcvbn-c)
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,zxcvbn-c)\
+ $$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+ zxcvbn-c \
+)
+endef
+endif
+
+
ifneq ($(SYSTEM_ZXING),)
define gb_LinkTarget__use_zxing
@@ -4182,35 +4388,21 @@ endif # ENABLE_ZXING
endif # SYSTEM_ZXING
-
-ifneq ($(SYSTEM_CUCKOO),)
-
-gb_ExternalProject__use_cuckoo_headers :=
-
-define gb_LinkTarget__use_cuckoo_headers
+ifneq ($(SYSTEM_FROZEN),)
+define gb_LinkTarget__use_frozen
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
+ $(FROZEN_CFLAGS)
)
-
endef
-
-else # !SYSTEM_CUCKOO
-
-define gb_ExternalProject__use_cuckoo_headers
-$(call gb_ExternalProject_use_unpacked,$(1),cuckoo)
-
-endef
-
-define gb_LinkTarget__use_cuckoo_headers
-$(call gb_LinkTarget_use_unpacked,$(1),cuckoo)
+else
+define gb_LinkTarget__use_frozen
+$(call gb_LinkTarget_use_unpacked,$(1),frozen)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(call gb_UnpackedTarball_get_dir,cuckoo) \
+ -I$(call gb_UnpackedTarball_get_dir,frozen/include/)\
$$(INCLUDE) \
)
-
endef
-
-endif # SYSTEM_CUCKOO
-
+endif
# vim: set noet sw=4 ts=4: