diff options
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 733 |
1 files changed, 437 insertions, 296 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 81a65a1a8590..60499758de40 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -128,9 +128,11 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,skia)/include/gpu \ -I$(call gb_UnpackedTarball_get_dir,skia)/include/config \ -I$(call gb_UnpackedTarball_get_dir,skia)/include/ports \ + -I$(call gb_UnpackedTarball_get_dir,skia)/include/private \ -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan \ -I$(call gb_UnpackedTarball_get_dir,skia)/tools/gpu \ -I$(call gb_UnpackedTarball_get_dir,skia) \ + -I$(SRCDIR)/external/skia/inc/ \ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_libraries,$(1),skia) @@ -222,7 +224,9 @@ endef endif # SYSTEM_CPPUNIT -ifneq ($(SYSTEM_EPOXY),) + +ifeq ($(ENABLE_EPOXY),TRUE) +ifeq ($(SYSTEM_EPOXY),TRUE) define gb_LinkTarget__use_epoxy $(call gb_LinkTarget_set_include,$(1),\ @@ -258,7 +262,14 @@ $(call gb_ExternalProject_use_external_project,$(1),epoxy) endef -endif # SYSTEM_EPOXY +endif # !SYSTEM_EPOXY +else # !ENABLE_EPOXY + +gb_LinkTarget__use_epoxy := +gb_ExternalProject__use_epoxy := + +endif # !ENABLE_EPOXY + define gb_LinkTarget__use_iconv ifeq ($(COM),MSC) @@ -295,6 +306,14 @@ $(call gb_LinkTarget_add_libs,$(1),\ -liconv \ ) endif +$(call gb_LinkTarget_use_system_win32_libs,$(1),\ + ws2_32 \ + advapi32 \ + kernel32 \ + shlwapi \ + crypt32 \ + bcrypt \ +) endef define gb_ExternalProject__use_mariadb-connector-c @@ -340,6 +359,7 @@ ifneq ($(SYSTEM_ZLIB),) define gb_LinkTarget__use_zlib $(call gb_LinkTarget_add_defs,$(1),\ -DSYSTEM_ZLIB \ + -DZLIB_CONST \ ) $(call gb_LinkTarget_add_libs,$(1),-lz) @@ -357,6 +377,10 @@ else # !SYSTEM_ZLIB define gb_LinkTarget__use_zlib_multiarch $(if $(2),,$(call gb_Output_error,gb_LinkTarget__use_zlib_multiarch needs two arguments)) +$(call gb_LinkTarget_add_defs,$(1), \ + -DZLIB_CONST \ +) + $(call gb_LinkTarget_set_include,$(1),\ $(ZLIB_CFLAGS) \ $$(INCLUDE) \ @@ -389,6 +413,10 @@ endif # SYSTEM_ZLIB ifneq ($(SYSTEM_LIBJPEG),) define gb_LinkTarget__use_libjpeg +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBJPEG_CFLAGS) \ +) $(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) $(call gb_LinkTarget_set_ldflags,$(1),\ $$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \ @@ -402,16 +430,15 @@ else define gb_LinkTarget__use_libjpeg $(call gb_LinkTarget_set_include,$(1),\ - $(LIBJPEG_CFLAGS) \ + -I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) -$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full) +$(call gb_LinkTarget_use_static_libraries,$(1),libjpeg-turbo) endef define gb_ExternalProject__use_libjpeg -$(call gb_ExternalProject_use_external_project,$(1),libjpeg-turbo) +$(call gb_ExternalProject_use_static_libraries,$(1),libjpeg-turbo) endef @@ -541,6 +568,7 @@ endef gb_ExternalProject__use_hunspell := else # !SYSTEM_HUNSPELL +ifneq ($(ENABLE_WASM_STRIP_HUNSPELL),TRUE) define gb_LinkTarget__use_hunspell $(call gb_LinkTarget_add_defs,$(1),\ @@ -568,6 +596,7 @@ $(call gb_ExternalProject_use_external_project,$(1),hunspell) endef +endif # ENABLE_WASM_STRIP_HUNSPELL endif # SYSTEM_HUNSPELL @@ -830,8 +859,6 @@ endef else # !SYSTEM_LIBNUMBERTEXT -ifneq ($(ENABLE_LIBNUMBERTEXT),) - $(eval $(call gb_Helper_register_packages_for_install,ooo, \ libnumbertext_numbertext \ )) @@ -842,9 +869,6 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libnumbertext/src) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_defs,$(1),\ - -DENABLE_LIBNUMBERTEXT \ -) ifeq ($(COM),MSC) $(call gb_LinkTarget_use_static_libraries,$(1),\ @@ -861,13 +885,6 @@ endif endef -else # !ENABLE_LIBNUMBERTEXT - -define gb_LinkTarget__use_libnumbertext -endef - -endif # ENABLE_LIBNUMBERTEXT - endif # SYSTEM_LIBNUMBERTEXT @@ -1074,98 +1091,6 @@ endef endif # SYSTEM_LIBLANGTAG -gb_ExternalProject__use_apr := - -ifeq ($(WITH_WEBDAV),serf) - -define gb_LinkTarget__use_apr -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(APR_CFLAGS) \ -) -$(call gb_LinkTarget_add_libs,$(1),\ - $(APR_LIBS) \ - $(if $(filter $(OS),LINUX),-lpthread) \ - $(if $(filter $(OS),MACOSX),-liconv) \ -) - -ifeq ($(SYSTEM_APR),) -$(call gb_LinkTarget_use_system_win32_libs,$(1),\ - mswsock \ - rpcrt4 \ - shell32 \ -) -$(call gb_LinkTarget_add_defs,$(1),\ - -DAPR_DECLARE_STATIC \ - -DAPU_DECLARE_STATIC \ -) -$(call gb_LinkTarget_use_external_project,$(1),apr_util) -endif - -endef - -define gb_ExternalProject__use_apr -ifeq ($(SYSTEM_APR),) -$(call gb_ExternalProject_use_external_project,$(1),apr_util) -endif - -endef - -define gb_LinkTarget__use_serf -$(call gb_LinkTarget_set_include,$(1),\ - $(SERF_CFLAGS) \ - $$(INCLUDE) \ -) -$(call gb_LinkTarget_add_libs,$(1),\ - $(SERF_LIBS) \ -) - -ifeq ($(SYSTEM_SERF),) -$(call gb_LinkTarget_use_external_project,$(1),serf) -endif - -endef - -else ifeq ($(WITH_WEBDAV),neon) - -ifneq ($(SYSTEM_NEON),) - -define gb_LinkTarget__use_neon -$(call gb_LinkTarget_add_defs,$(1),\ - -DNEON_VERSION=0x$(NEON_VERSION) \ - -DSYSTEM_NEON \ -) -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(NEON_CFLAGS) \ -) - -$(call gb_LinkTarget_add_libs,$(1),$(NEON_LIBS)) - -endef - -else # !SYSTEM_NEON - -$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ - neon \ -)) - -define gb_LinkTarget__use_neon -$(call gb_LinkTarget_use_unpacked,$(1),neon) -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,neon/src) \ - $$(INCLUDE) \ -) -$(call gb_LinkTarget_use_libraries,$(1),\ - neon \ -) - -endef - -endif # SYSTEM_NEON - -endif # WITH_WEBDAV - ifneq ($(SYSTEM_REDLAND),) define gb_LinkTarget__use_librdf @@ -1257,9 +1182,6 @@ endif # ANDROID endif # SYSTEM_REDLAND - -ifneq ($(USING_X11)$(ENABLE_CAIRO_CANVAS)$(DISABLE_GUI),) # or - ifneq ($(SYSTEM_CAIRO),) define gb_LinkTarget__use_cairo @@ -1274,9 +1196,11 @@ endef else # !SYSTEM_CAIRO +ifneq ($(filter-out MACOSX WNT,$(OS)),) + $(eval $(call gb_Helper_register_packages_for_install,ooo,\ cairo \ - $(if $(filter $(OS),WNT),,pixman) \ + pixman \ )) define gb_LinkTarget__use_cairo @@ -1286,38 +1210,22 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,cairo) \ -I$(call gb_UnpackedTarball_get_dir,cairo)/src \ + -I$(call gb_UnpackedTarball_get_dir,pixman)/pixman \ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \ - $(if $(filter-out MACOSX WNT,$(OS)), \ - -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 -endif # SYSTEM_CAIRO - -else ifeq ($(OS),ANDROID) - -define gb_LinkTarget__use_cairo -$(call gb_LinkTarget_use_package,$(1),cairo) -$(call gb_LinkTarget_use_package,$(1),pixman) -$(call gb_LinkTarget_use_external,$(1),freetype_headers) -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,cairo) \ - -I$(call gb_UnpackedTarball_get_dir,cairo)/src \ - $$(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 \ -) - -endef +endif # !MACOSX, !WNT -endif # CAIRO +endif # !SYSTEM_CAIRO ifneq ($(SYSTEM_FREETYPE),) @@ -1367,10 +1275,30 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS)) endef -else +ifeq ($(OS),EMSCRIPTEN) +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + libfontconfig_data \ +)) +endif + +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) \ @@ -1382,6 +1310,11 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef +define gb_ExternalProject__use_fontconfig +$(call gb_ExternalProject_use_external_project,$(1),fontconfig) + +endef + endif # SYSTEM_FONTCONFIG ifneq ($(SYSTEM_GRAPHITE),) @@ -1550,13 +1483,13 @@ endef endif # SYSTEM_HARFBUZZ -ifeq ($(DISABLE_OPENSSL),TRUE) +ifneq ($(ENABLE_OPENSSL),TRUE) gb_ExternalProject__use_openssl:= gb_LinkTarget__use_openssl_headers:= gb_LinkTarget__use_openssl:= -else # !DISABLE_OPENSSL +else # ENABLE_OPENSSL ifneq ($(SYSTEM_OPENSSL),) @@ -1584,7 +1517,7 @@ $(call gb_ExternalProject_use_package,$(1),openssl) endef define gb_LinkTarget__use_openssl_headers -$(call gb_LinkTarget_use_external_project,$(1),openssl) +$(call gb_LinkTarget_use_external_project,$(1),openssl,full) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,openssl)/include \ $$(INCLUDE) \ @@ -1596,13 +1529,14 @@ define gb_LinkTarget__use_openssl $(call gb_LinkTarget_use_package,$(1),openssl) ifeq ($(OS),WNT) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \ + $(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.lib \ + $(call gb_UnpackedTarball_get_dir,openssl)/libssl.lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \ $(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \ + $(if $(filter $(OS),LINUX),-pthread) \ ) $(call gb_LinkTarget_use_external_project,$(1),openssl) ifeq ($(OS),SOLARIS) @@ -1616,41 +1550,36 @@ endif endef endif # SYSTEM_OPENSSL -endif # DISABLE_OPENSSL +endif # ENABLE_OPENSSL -ifeq ($(DISABLE_OPENSSL),TRUE) +ifneq ($(SYSTEM_ARGON2),) -define gb_LinkTarget__use_gnutls +define gb_LinkTarget__use_argon2 $(call gb_LinkTarget_set_include,$(1),\ + $(ARGON2_CFLAGS) \ $$(INCLUDE) \ - $(GNUTLS_CFLAGS) \ ) +$(call gb_LinkTarget_add_libs,$(1),$(ARGON2_LIBS)) -$(call gb_LinkTarget_add_defs,$(1),\ - -DDISABLE_OPENSSL \ -) +endef -$(call gb_LinkTarget_add_libs,$(1),$(GNUTLS_LIBS)) +else # !SYSTEM_ARGON2 -endef +$(eval $(call gb_Helper_register_packages_for_install,ooo, \ + argon2 \ +)) -define gb_LinkTarget__use_libgcrypt +define gb_LinkTarget__use_argon2 $(call gb_LinkTarget_set_include,$(1),\ + $(ARGON2_CFLAGS) \ $$(INCLUDE) \ - $(LIBGCRYPT_CFLAGS) \ ) - -$(call gb_LinkTarget_add_libs,$(1),$(LIBGCRYPT_LIBS)) - +$(call gb_LinkTarget_add_libs,$(1),$(ARGON2_LIBS)) +$(call gb_LinkTarget_use_package,$(1),argon2) endef -else # !DISABLE_OPENSSL - -gb_LinkTarget__use_gnutls:= -gb_LinkTarget__use_libgcrypt:= - -endif # DISABLE_OPENSSL +endif # SYSTEM_ARGON2 ifneq ($(SYSTEM_CDR),) @@ -1880,6 +1809,7 @@ endef gb_ExternalProject__use_epubgen := else # !SYSTEM_EPUBGEN +ifneq ($(ENABLE_WASM_STRIP_EPUB),TRUE) define gb_LinkTarget__use_epubgen $(call gb_LinkTarget_set_include,$(1),\ @@ -1897,6 +1827,7 @@ $(call gb_ExternalProject_use_external_project,$(1),libepubgen) endef +endif # ENABLE_WASM_STRIP_EPUB endif # SYSTEM_EPUBGEN ifneq ($(SYSTEM_REVENGE),) @@ -2721,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),) @@ -2738,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) @@ -2751,7 +2780,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ifeq ($(COM),MSC) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(if $(filter X86_64,$(CPUNAME)),x64,x86)-$(if $(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \ + $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-zlib-static-ipv6-sspi-schannel/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ @@ -2803,9 +2832,13 @@ endef else # !SYSTEM_POPPLER +$(eval $(call gb_Helper_register_packages_for_install,pdfimport,\ + poppler_data \ +)) + define gb_LinkTarget__use_poppler $(call gb_LinkTarget_use_external_project,$(1),poppler,full) - +$(call gb_LinkTarget_use_package,$(1),poppler_data) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,poppler) \ -I$(call gb_UnpackedTarball_get_dir,poppler)/poppler \ @@ -2814,7 +2847,6 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_use_static_libraries,$(1),poppler) - $(call gb_LinkTarget_use_external,$(1),libjpeg) ifeq ($(OS),MACOSX) @@ -2844,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),\ @@ -2874,7 +2907,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ - clucene \ + $(call gb_Helper_optionals_or,HELPTOOLS XMLHELP,clucene) \ )) endif # SYSTEM_CLUCENE @@ -3053,9 +3086,16 @@ 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 -$(call gb_LinkTarget_use_external_project,$(1),postgresql) +$(call gb_LinkTarget_use_external_project,$(1),postgresql,full) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,postgresql)/src/include \ @@ -3063,25 +3103,28 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) +ifeq ($(OS),WNT) + $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \ + $(call gb_UnpackedTarball_get_dir,postgresql)/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \ ) -ifeq ($(OS),WNT) -$(call gb_LinkTarget_use_external,$(1),openssl) +else # !WNT -$(call gb_LinkTarget_use_system_win32_libs,$(1),\ - secur32 \ - ws2_32 \ +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \ + $(call gb_UnpackedTarball_get_dir,postgresql)/src/common/libpgcommon$(gb_StaticLibrary_PLAINEXT) \ + $(call gb_UnpackedTarball_get_dir,postgresql)/src/port/libpgport$(gb_StaticLibrary_PLAINEXT) \ + $(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \ ) -endif +endif # !WNT -endef +endef # gb_LinkTarget__use_postgresql -endif # SYSTEM_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),\ @@ -3107,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),\ @@ -3135,6 +3202,33 @@ endef endif # ENABLE_QT5 +ifeq ($(ENABLE_QT6),TRUE) + +define gb_LinkTarget__use_qt6 +$(call gb_LinkTarget_set_include,$(1),\ + $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(QT6_CFLAGS)))) \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_add_defs,$(1),\ + $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(QT6_CFLAGS))) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(QT6_LIBS) \ +) + +endef + +else # !ENABLE_QT6 + +define gb_LinkTarget__use_qt6 + +endef + +endif # ENABLE_QT6 + + # PYTHON # extra python_headers external because pyuno wrapper must not link python ifneq ($(SYSTEM_PYTHON),) @@ -3164,6 +3258,7 @@ else # !SYSTEM_PYTHON $(eval $(call gb_Helper_register_packages_for_install,python,\ python3 \ + $(if $(filter WNT,$(OS)),libffi) \ )) define gb_LinkTarget__use_python_headers @@ -3186,8 +3281,15 @@ $(call gb_LinkTarget_use_package,$(1),python3) endif ifeq ($(OS),WNT) +ifeq ($(CPUNAME),X86_64) +python_arch_subdir=amd64/ +else ifeq ($(CPUNAME),AARCH64) +python_arch_subdir=arm64/ +else +python_arch_subdir=win32/ +endif $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(if $(filter X86_64,$(CPUNAME)),amd64,win32)/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),\ @@ -3196,7 +3298,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ else $(call gb_LinkTarget_add_libs,$(1),\ -L$(call gb_UnpackedTarball_get_dir,python3) \ - -lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \ + -lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if $(ENABLE_DBGUTIL),d) \ ) endif @@ -3273,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.15 \ + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.18 \ ) $(if $(SYSTEM_BOOST), \ @@ -3292,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.15 \ + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.18 \ ) endef @@ -3394,6 +3496,11 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef +define gb_LinkTarget__use_nssutil3 +$(call gb_LinkTarget__use_nss3,$(1)) + +endef + define gb_LinkTarget__use_plc4 $(call gb_LinkTarget__use_nss3,$(1)) @@ -3463,6 +3570,27 @@ endif endef +define gb_LinkTarget__use_nssutil3 +$(call gb_LinkTarget_use_package,$(1),nss) +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss \ + -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include \ +) + +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nssutil3.lib \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \ + -lnssutil3 \ +) +endif + +endef + define gb_ExternalProject__use_nss3 $(call gb_ExternalProject_use_package,$(1),nss) @@ -3571,6 +3699,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef $(eval $(call gb_Helper_register_packages_for_install,ooo,\ + gpgmepp \ libassuan \ libgpg-error \ )) @@ -3579,10 +3708,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ gpgmepp \ )) -$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ - gpgme-w32spawn \ -)) - endif ifneq ($(filter MACOSX LINUX,$(OS)),) @@ -3713,32 +3838,6 @@ endif # SYSTEM_RHINO endif -ifneq ($(SYSTEM_APACHE_COMMONS),) - -define gb_Jar__use_commons-logging -$(call gb_Jar_use_system_jar,$(1),$(COMMONS_LOGGING_JAR)) -endef -gb_ExternalProject__use_commons-logging := - -else # !SYSTEM_APACHE_COMMONS - -ifeq ($(ENABLE_JAVA),TRUE) -$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ - commons-logging-$(COMMONS_LOGGING_VERSION) \ -)) -endif - -define gb_Jar__use_commons-logging -$(call gb_Jar_use_external_project,$(1),apache_commons_logging) -$(call gb_Jar_use_jar,$(1),commons-logging-$(COMMONS_LOGGING_VERSION)) -endef -define gb_ExternalProject__use_commons-logging -$(call gb_ExternalProject_use_external_project,$(1),apache_commons_logging) -endef - -endif # SYSTEM_APACHE_COMMONS - - ifneq ($(SYSTEM_JFREEREPORT),) define gb_Jar__use_flow-engine @@ -3849,50 +3948,59 @@ 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 -# FIXME: the library target should be for build too define gb_Executable__register_bestreversemap $(call gb_Executable_add_runtime_dependencies,bestreversemap,\ - $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target,sal_textenc))) \ + $(call gb_CondLibSalTextenc,$(call gb_Library_get_target_for_build,sal_textenc)) \ ) endef # TODO depending on the whole URE might be overkill, but I do not have a # Windows machine to debug it... -# FIXME: the library target should be for build too define gb_Executable__register_climaker $(call gb_Executable_add_runtime_dependencies,climaker,\ - $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ + $(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \ $(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ - $(call gb_UnoApi_get_target,udkapi) \ + $(call gb_UnoApi_get_target_for_build,udkapi) \ $(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) ) endef define gb_Executable__register_cppumaker $(call gb_Executable_add_runtime_dependencies,cppumaker,\ - $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target,sal_textenc))) \ + $(call gb_CondLibSalTextenc,$(call gb_Library_get_target,sal_textenc)) \ ) endef # This is used to determine what we need for 'build' platform. -# FIXME: the library target should be for build too define gb_Executable__register_gengal $(call gb_Executable_add_runtime_dependencies,gengal,\ - $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ - $(if $(filter MACOSX,$(OS)),$(call gb_Library_get_target,vclplug_osx)) \ - $(if $(filter WNT,$(OS)),$(call gb_Library_get_target,vclplug_win)) \ - $(call gb_Package_get_target_for_build,postprocess_images) \ + $(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \ + $(call gb_Library_get_target_for_build,localedata_en) \ + $(if $(filter MACOSX,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_osx)) \ + $(if $(filter WNT,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_win)) \ + $(if $(filter host,$(gb_Side)),$(call gb_Package_get_target,postprocess_images)) \ $(call gb_Package_get_target_for_build,postprocess_registry) \ $(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \ $(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,fundamental) \ $(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,louno) \ $(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ $(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/services/services.rdb \ - $(call gb_UnoApi_get_target,offapi) \ - $(call gb_UnoApi_get_target,udkapi) \ + $(call gb_UnoApi_get_target_for_build,offapi) \ + $(call gb_UnoApi_get_target_for_build,udkapi) \ ) endef @@ -3907,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,\ @@ -3924,26 +4026,24 @@ endef # FIXME ure/services.rdb needs cleanup # The dependencies on ure/services.rdb and udkapi.rdb are implicitly required # due to the settings for URE_SERVICES and URE_TYPES in cppuhelper/source/unorc: -# FIXME: the library target should be for build too define gb_Executable__register_saxparser $(call gb_Executable_add_runtime_dependencies,saxparser,\ - $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ + $(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \ $(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \ $(call gb_Rdb_get_target_for_build,saxparser) \ $(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER_FOR_BUILD)/services.rdb \ - $(call gb_UnoApi_get_target,udkapi) \ + $(call gb_UnoApi_get_target_for_build,udkapi) \ ) endef # NOTE: the dependencies on ure/services.rdb and udkapi.rdb are implicitly # required due to the settings for URE_SERVICES and URE_TYPES in # cppuhelper/source/unorc -# FIXME: the library target should be for build too define gb_Executable__register_uno $(call gb_Executable_add_runtime_dependencies,uno,\ - $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ + $(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \ $(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ - $(call gb_UnoApi_get_target,udkapi) \ + $(call gb_UnoApi_get_target_for_build,udkapi) \ ) endef @@ -3985,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 @@ -4013,7 +4100,7 @@ $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_ else -$(call gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin)) +$(call gb_ExternalExecutable_set_internal,python,$(INSTROOT_FOR_BUILD)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin)) $(call gb_ExternalExecutable_set_precommand,python,$(subst $$,$$$$,$(gb_Python_PRECOMMAND))) $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3)) @@ -4093,23 +4180,6 @@ endef endif -ifeq (OWNCLOUD_ANDROID_LIB,$(filter OWNCLOUD_ANDROID_LIB,$(BUILD_TYPE))) - -$(eval $(call gb_Helper_register_jars,OXT,\ - owncloud-android-library \ -)) - -define gb_Jar__use_owncloud_android_lib -$(call gb_Jar_use_external_project,$(1),owncloud-android-lib) -$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,owncloud-android-lib)/bin/owncloud-android-library.jar) -endef -define gb_ExternalProject__use_owncloud_android_lib -$(call gb_ExternalProject_use_external_project,$(1),owncloud_android_lib) -endef - -endif - -ifneq ($(ENABLE_ONLINE_UPDATE_MAR),) ifneq ($(SYSTEM_BZIP2),) define gb_LinkTarget__use_bzip2 @@ -4148,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), \ @@ -4173,40 +4242,26 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\ )) endif -ifneq ($(SYSTEM_QRCODEGEN),) +ifneq ($(SYSTEM_DRAGONBOX),) -define gb_LinkTarget__use_qrcodegen +define gb_LinkTarget__use_dragonbox $(call gb_LinkTarget_set_include,$(1),\ - -DSYSTEM_QRCODEGEN \ $$(INCLUDE) \ - $(QRCODEGEN_CFLAGS) \ + $$(DRAGONBOX_CFLAGS) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(QRCODEGEN_LIBS)) - endef -gb_ExternalProject__use_qrcodegen := - -else # !SYSTEM_QRCODEGEN +else -define gb_LinkTarget__use_qrcodegen -$(call gb_LinkTarget_use_unpacked,$(1),qrcodegen) +define gb_LinkTarget__use_dragonbox +$(call gb_LinkTarget_use_unpacked,$(1),dragonbox) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,qrcodegen/cpp/)\ + -I$(call gb_UnpackedTarball_get_dir,dragonbox/include/)\ $$(INCLUDE) \ ) -$(call gb_LinkTarget_use_static_libraries,$(1),\ - qrcodegen \ -) - endef -define gb_ExternalProject__use_qrcodegen -$(call gb_ExternalProject_use_static_libraries,$(1),qrcodegen) - -endef - -endif # SYSTEM_QRCODEGEN +endif define gb_LinkTarget__use_dtoa $(call gb_LinkTarget_use_unpacked,$(1),dtoa) @@ -4248,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),\ @@ -4264,4 +4319,90 @@ 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 +$(call gb_LinkTarget_set_include,$(1),\ + -DSYSTEM_ZXING \ + $$(INCLUDE) \ + $(ZXING_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(ZXING_LIBS)) + +endef + +gb_ExternalProject__use_zxing := + +else # !SYSTEM_ZXING + +ifneq ($(ENABLE_ZXING),) + +define gb_LinkTarget__use_zxing +$(call gb_LinkTarget_use_unpacked,$(1),zxing) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,zxing/core/src/)\ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_use_static_libraries,$(1),\ + zxing \ +) + +endef + +define gb_ExternalProject__use_zxing +$(call gb_ExternalProject_use_static_libraries,$(1),zxing) + +endef + +else # !ENABLE_ZXING + +define gb_LinkTarget__use_zxing +endef + +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),\ + -I$(call gb_UnpackedTarball_get_dir,frozen/include/)\ + $$(INCLUDE) \ +) +endef +endif + # vim: set noet sw=4 ts=4: |