2011-08-09 12:12:48 -05:00
|
|
|
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
2011-04-01 15:49:35 -05:00
|
|
|
#
|
2013-05-16 15:56:04 -05:00
|
|
|
# This file is part of the LibreOffice project.
|
2012-07-27 21:14:39 -05:00
|
|
|
#
|
2013-05-16 15:56:04 -05:00
|
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
2011-04-01 15:49:35 -05:00
|
|
|
#
|
2013-05-16 15:56:04 -05:00
|
|
|
# This file incorporates work covered by the following license notice:
|
2011-04-01 15:49:35 -05:00
|
|
|
#
|
2013-05-16 15:56:04 -05:00
|
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
# contributor license agreements. See the NOTICE file distributed
|
|
|
|
# with this work for additional information regarding copyright
|
|
|
|
# ownership. The ASF licenses this file to you under the Apache
|
|
|
|
# License, Version 2.0 (the "License"); you may not use this file
|
|
|
|
# except in compliance with the License. You may obtain a copy of
|
|
|
|
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
2011-04-01 15:49:35 -05:00
|
|
|
#
|
|
|
|
|
|
|
|
# this file describes all the external libraries
|
|
|
|
# depending on the configure options these may be taken from the system,
|
|
|
|
# or the internal/bundled copy may be built.
|
|
|
|
|
2014-04-18 05:55:56 -05:00
|
|
|
# for every external, a function gb_LinkTarget__use_FOO is defined,
|
2011-04-01 15:49:35 -05:00
|
|
|
# once for the system case, once for the internal case.
|
|
|
|
|
|
|
|
# in the system case, no libraries should be registered, but the target-local
|
|
|
|
# variable LIBS should be set to FOO_LIBS, and INCLUDES to FOO_CFLAGS.
|
|
|
|
|
2014-11-30 11:26:01 -06:00
|
|
|
|
|
|
|
ifeq ($(CPUNAME),X86_64)
|
|
|
|
wnt_arch_subdir_optional=x64/
|
|
|
|
wnt_arch_subdir_mandatory=x64
|
|
|
|
else ifeq ($(CPUNAME),INTEL)
|
|
|
|
wnt_arch_subdir_mandatory=Win32
|
|
|
|
endif
|
|
|
|
|
2012-04-07 06:59:33 -05:00
|
|
|
# External headers
|
|
|
|
|
2014-02-11 12:11:47 -06:00
|
|
|
ifneq ($(SYSTEM_ODBC_HEADERS),)
|
2012-04-07 06:46:59 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_odbc_headers
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DSYSTEM_ODBC_HEADERS \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-02-11 12:11:47 -06:00
|
|
|
else # !SYSTEM_ODBC_HEADERS
|
2012-04-07 06:46:59 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_odbc_headers
|
2013-05-06 13:09:47 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2013-11-04 10:40:17 -06:00
|
|
|
-I$(SRCDIR)/external/unixODBC/inc \
|
2013-05-06 13:09:47 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2012-04-07 06:46:59 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-02-11 12:11:47 -06:00
|
|
|
endif # SYSTEM_ODBC_HEADERS
|
2012-04-07 06:46:59 -05:00
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_MDDS),)
|
2012-08-29 05:27:17 -05:00
|
|
|
|
2014-03-03 08:29:27 -06:00
|
|
|
gb_ExternalProject__use_mdds_headers :=
|
|
|
|
|
2014-03-03 09:23:27 -06:00
|
|
|
define gb_LinkTarget__use_mdds_headers
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(MDDS_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
2012-08-29 05:27:17 -05:00
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
else # !SYSTEM_MDDS
|
2012-08-29 05:27:17 -05:00
|
|
|
|
2014-03-03 08:29:27 -06:00
|
|
|
define gb_ExternalProject__use_mdds_headers
|
2015-06-24 08:08:48 -05:00
|
|
|
$(call gb_ExternalProject_use_unpacked,$(1),mdds)
|
2014-03-03 08:29:27 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-08-29 05:27:17 -05:00
|
|
|
define gb_LinkTarget__use_mdds_headers
|
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),mdds)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2014-03-03 09:23:27 -06:00
|
|
|
$(MDDS_CFLAGS) \
|
2012-08-29 05:27:17 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
endif # SYSTEM_MDDS
|
2012-08-29 05:27:17 -05:00
|
|
|
|
2014-02-11 12:08:10 -06:00
|
|
|
ifneq ($(SYSTEM_GLM),)
|
2013-12-23 11:31:55 -06:00
|
|
|
|
2020-02-06 10:45:18 -06:00
|
|
|
define gb_LinkTarget__use_glm_headers
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DGLM_FORCE_CTOR_INIT \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-06-25 08:19:41 -05:00
|
|
|
gb_ExternalProject__use_glm_headers :=
|
2013-12-23 11:31:55 -06:00
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_glm_headers
|
2020-02-06 10:45:18 -06:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DGLM_FORCE_CTOR_INIT \
|
|
|
|
)
|
2013-12-23 11:31:55 -06:00
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),glm)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2015-05-19 09:59:26 -05:00
|
|
|
$(GLM_CFLAGS) \
|
2013-12-23 11:31:55 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-06-25 08:19:41 -05:00
|
|
|
define gb_ExternalProject__use_glm_headers
|
2015-06-24 08:11:40 -05:00
|
|
|
$(call gb_ExternalProject_use_unpacked,$(1),glm)
|
2014-06-25 08:19:41 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-12-23 11:31:55 -06:00
|
|
|
endif
|
|
|
|
|
2019-10-12 09:24:03 -05:00
|
|
|
ifneq ($(ENABLE_SKIA),)
|
|
|
|
define gb_LinkTarget__use_skia
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/skia/include/core \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/skia/include/effects \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/skia/include/gpu \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/skia/include/config \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/skia/include/ports \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/skia/include/private \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/skia/include/third_party/vulkan \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/skia/tools/gpu \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/skia \
|
2020-06-25 03:35:00 -05:00
|
|
|
-I$(SRCDIR)/external/skia/inc/ \
|
2019-10-17 05:07:48 -05:00
|
|
|
$$(INCLUDE) \
|
2019-10-12 09:24:03 -05:00
|
|
|
)
|
2024-05-07 12:27:43 -05:00
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),skia)
|
2019-10-17 05:07:48 -05:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \
|
2024-05-07 12:27:43 -05:00
|
|
|
-DSKIA_DLL \
|
2019-10-17 05:07:48 -05:00
|
|
|
)
|
2019-10-12 09:24:03 -05:00
|
|
|
endef
|
2024-05-07 12:27:43 -05:00
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\
|
|
|
|
skia \
|
|
|
|
))
|
2019-10-12 09:24:03 -05:00
|
|
|
endif
|
|
|
|
|
2013-05-06 13:23:49 -05:00
|
|
|
ifeq (SANE,$(filter SANE,$(BUILD_TYPE)))
|
2012-12-21 07:08:27 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_sane_headers
|
2013-05-06 13:14:35 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2017-12-22 11:46:12 -06:00
|
|
|
$(if $(filter WNT,$(OS)), \
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/twain_dsm/pub/include, \
|
2017-12-22 11:46:12 -06:00
|
|
|
-I$(SRCDIR)/external/sane/inc) \
|
|
|
|
$$(INCLUDE) \
|
2012-12-21 07:08:27 -06:00
|
|
|
)
|
|
|
|
|
2017-12-22 11:46:12 -06:00
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),twain_dsm)
|
|
|
|
endif
|
|
|
|
|
2012-12-21 07:08:27 -06:00
|
|
|
endef
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
gb_LinkTarget__use_sane_headers :=
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
2014-02-11 12:28:33 -06:00
|
|
|
ifneq ($(SYSTEM_BLUEZ),)
|
2013-11-04 23:53:49 -06:00
|
|
|
|
|
|
|
gb_LinkTarget__use_bluez_bluetooth_headers :=
|
|
|
|
|
|
|
|
else # !SYSTEM_BLUEZ
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_bluez_bluetooth_headers
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
-I$(SRCDIR)/external/bluez_bluetooth/inc \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_BLUEZ
|
|
|
|
|
2012-04-07 06:59:33 -05:00
|
|
|
# External libraries
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_CPPUNIT),)
|
2011-07-25 03:34:22 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_cppunit
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(CPPUNIT_CFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(CPPUNIT_LIBS) \
|
|
|
|
)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-07-25 03:34:22 -05:00
|
|
|
endef
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
else # !SYSTEM_CPPUNIT
|
2011-07-25 03:34:22 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_cppunit
|
2016-02-23 04:28:31 -06:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),cppunit, full)
|
2012-11-25 15:37:40 -06:00
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/cppunit/include\
|
2012-11-25 15:37:40 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2013-10-23 16:35:16 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/cppunit/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/cppunitd_dll.lib,ReleaseDll/cppunit_dll.lib) \
|
2013-10-23 16:35:16 -05:00
|
|
|
)
|
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/cppunit/src/cppunit/.libs -lcppunit \
|
2013-10-23 16:35:16 -05:00
|
|
|
)
|
|
|
|
endif
|
|
|
|
|
2011-07-25 03:34:22 -05:00
|
|
|
endef
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
endif # SYSTEM_CPPUNIT
|
2011-04-01 15:49:35 -05:00
|
|
|
|
2022-01-05 04:49:19 -06:00
|
|
|
|
|
|
|
ifeq ($(ENABLE_EPOXY),TRUE)
|
|
|
|
ifeq ($(SYSTEM_EPOXY),TRUE)
|
2014-02-09 14:19:07 -06:00
|
|
|
|
2016-11-25 14:25:27 -06:00
|
|
|
define gb_LinkTarget__use_epoxy
|
2014-02-09 14:19:07 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2016-11-25 14:25:27 -06:00
|
|
|
$(EPOXY_CFLAGS) \
|
2014-02-09 14:19:07 -06:00
|
|
|
)
|
2016-11-25 14:25:27 -06:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(EPOXY_LIBS))
|
2014-02-09 14:19:07 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2016-11-25 14:25:27 -06:00
|
|
|
gb_ExternalProject__use_epoxy :=
|
2014-06-25 08:19:41 -05:00
|
|
|
|
2016-11-25 14:25:27 -06:00
|
|
|
else # !SYSTEM_EPOXY
|
2014-02-09 14:19:07 -06:00
|
|
|
|
2016-11-25 14:25:27 -06:00
|
|
|
define gb_LinkTarget__use_epoxy
|
2014-02-09 14:19:07 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/epoxy/include \
|
2016-11-25 14:25:27 -06:00
|
|
|
$$(INCLUDE) \
|
2014-02-09 14:19:07 -06:00
|
|
|
)
|
|
|
|
|
2016-11-25 14:25:27 -06:00
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
epoxy \
|
2014-02-09 14:19:07 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2016-11-25 14:25:27 -06:00
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
|
|
|
epoxy \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_epoxy
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),epoxy)
|
2014-06-25 08:19:41 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2022-01-05 04:49:19 -06:00
|
|
|
endif # !SYSTEM_EPOXY
|
|
|
|
else # !ENABLE_EPOXY
|
|
|
|
|
|
|
|
gb_LinkTarget__use_epoxy :=
|
|
|
|
gb_ExternalProject__use_epoxy :=
|
|
|
|
|
|
|
|
endif # !ENABLE_EPOXY
|
|
|
|
|
2014-02-09 14:19:07 -06:00
|
|
|
|
2013-01-03 04:48:14 -06:00
|
|
|
define gb_LinkTarget__use_iconv
|
2018-08-16 09:35:17 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),libiconv.lib)
|
|
|
|
else
|
2013-01-03 04:48:14 -06:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),-liconv)
|
2018-08-16 09:35:17 -05:00
|
|
|
endif
|
2013-01-03 04:48:14 -06:00
|
|
|
endef
|
|
|
|
|
2017-09-14 06:30:05 -05:00
|
|
|
ifneq ($(SYSTEM_MARIADB_CONNECTOR_C),)
|
2013-11-04 23:49:33 -06:00
|
|
|
|
2017-09-14 06:30:05 -05:00
|
|
|
define gb_LinkTarget__use_mariadb-connector-c
|
2013-11-04 23:49:33 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(MARIADB_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(MARIADB_LIBS))
|
|
|
|
|
|
|
|
endef
|
2017-09-14 06:30:05 -05:00
|
|
|
gb_ExternalProject__use_mariadb-connector-c :=
|
2013-11-04 23:49:33 -06:00
|
|
|
|
2017-09-14 06:30:05 -05:00
|
|
|
else # !SYSTEM_MARIADB_CONNECTOR_C
|
2013-11-04 23:49:33 -06:00
|
|
|
|
2017-09-14 06:30:05 -05:00
|
|
|
define gb_LinkTarget__use_mariadb-connector-c
|
2013-11-04 23:49:33 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(MARIADB_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
2017-09-14 06:30:05 -05:00
|
|
|
mariadb-connector-c \
|
2013-11-04 23:49:33 -06:00
|
|
|
)
|
2018-08-20 12:07:40 -05:00
|
|
|
ifeq ($(OS),MACOSX)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
-liconv \
|
|
|
|
)
|
|
|
|
endif
|
2020-06-16 08:09:50 -05:00
|
|
|
$(call gb_LinkTarget_use_system_win32_libs,$(1),\
|
|
|
|
ws2_32 \
|
|
|
|
advapi32 \
|
|
|
|
kernel32 \
|
|
|
|
shlwapi \
|
|
|
|
crypt32 \
|
2023-10-20 00:52:46 -05:00
|
|
|
bcrypt \
|
2020-06-16 08:09:50 -05:00
|
|
|
)
|
2013-11-04 23:49:33 -06:00
|
|
|
|
|
|
|
endef
|
2017-09-14 06:30:05 -05:00
|
|
|
define gb_ExternalProject__use_mariadb-connector-c
|
|
|
|
$(call gb_ExternalProject_use_static_libraries,$(1),mariadb-connector-c)
|
2013-11-04 23:49:33 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-09-14 06:30:05 -05:00
|
|
|
endif # SYSTEM_MARIADB_CONNECTOR_C
|
2013-11-04 23:49:33 -06:00
|
|
|
|
|
|
|
|
2017-09-14 06:30:05 -05:00
|
|
|
ifneq ($(SYSTEM_MARIADB_CONNECTOR_C),)
|
2013-01-23 15:29:08 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_mysql
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
2013-03-06 04:45:50 -06:00
|
|
|
-DSYSTEM_MARIADB \
|
2013-01-23 15:29:08 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2013-03-06 09:33:07 -06:00
|
|
|
$(MARIADB_LIBS) \
|
2013-01-23 15:29:08 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2013-03-06 09:33:07 -06:00
|
|
|
$(MARIADB_CFLAGS) \
|
2013-01-23 15:29:08 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_mysql
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
2014-02-11 09:21:04 -06:00
|
|
|
ifneq ($(SYSTEM_ZLIB),)
|
2011-04-01 15:49:35 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_zlib
|
2011-04-13 11:11:41 -05:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
2011-04-01 15:49:35 -05:00
|
|
|
-DSYSTEM_ZLIB \
|
2021-08-04 01:00:16 -05:00
|
|
|
-DZLIB_CONST \
|
2011-04-01 15:49:35 -05:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),-lz)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-10-26 08:33:26 -05:00
|
|
|
# nothing on system
|
|
|
|
define gb_LinkTarget__use_zlib_x64
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-03-14 06:45:24 -05:00
|
|
|
gb_ExternalProject__use_zlib :=
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
else # !SYSTEM_ZLIB
|
|
|
|
|
2012-10-26 08:33:26 -05:00
|
|
|
define gb_LinkTarget__use_zlib_multiarch
|
|
|
|
$(if $(2),,$(call gb_Output_error,gb_LinkTarget__use_zlib_multiarch needs two arguments))
|
|
|
|
|
2021-08-04 01:00:16 -05:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1), \
|
|
|
|
-DZLIB_CONST \
|
|
|
|
)
|
|
|
|
|
2012-09-08 09:29:05 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2013-05-08 08:47:24 -05:00
|
|
|
$(ZLIB_CFLAGS) \
|
2012-09-08 09:29:05 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2012-10-26 08:33:26 -05:00
|
|
|
|
2012-04-07 16:22:08 -05:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
2012-10-26 08:33:26 -05:00
|
|
|
$(2) \
|
2011-04-01 15:49:35 -05:00
|
|
|
)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-10-26 08:33:26 -05:00
|
|
|
define gb_LinkTarget__use_zlib
|
|
|
|
$(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_zlib_x64
|
|
|
|
$(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib_x64)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-03-14 06:45:24 -05:00
|
|
|
define gb_ExternalProject__use_zlib
|
|
|
|
$(call gb_ExternalProject_use_static_libraries,$(1),zlib)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endif # SYSTEM_ZLIB
|
|
|
|
|
|
|
|
|
2017-09-13 15:50:14 -05:00
|
|
|
ifneq ($(SYSTEM_LIBJPEG),)
|
2011-04-01 15:49:35 -05:00
|
|
|
|
2017-09-13 15:50:14 -05:00
|
|
|
define gb_LinkTarget__use_libjpeg
|
2021-10-20 10:07:29 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(LIBJPEG_CFLAGS) \
|
|
|
|
)
|
2016-11-02 08:13:54 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS))
|
2011-04-01 15:49:35 -05:00
|
|
|
$(call gb_LinkTarget_set_ldflags,$(1),\
|
2011-04-13 11:11:39 -05:00
|
|
|
$$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \
|
2011-04-01 15:49:35 -05:00
|
|
|
)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2017-09-13 15:50:14 -05:00
|
|
|
gb_ExternalProject__use_libjpeg :=
|
2016-11-02 08:13:54 -05:00
|
|
|
|
2017-03-14 09:20:36 -05:00
|
|
|
else
|
2014-11-17 02:16:34 -06:00
|
|
|
|
2017-09-13 15:50:14 -05:00
|
|
|
define gb_LinkTarget__use_libjpeg
|
2014-11-17 02:16:34 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libjpeg-turbo \
|
2014-11-17 02:16:34 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2021-10-20 10:07:29 -05:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),libjpeg-turbo)
|
2014-11-17 02:16:34 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-09-13 15:50:14 -05:00
|
|
|
define gb_ExternalProject__use_libjpeg
|
2022-01-02 13:14:04 -06:00
|
|
|
$(call gb_ExternalProject_use_static_libraries,$(1),libjpeg-turbo)
|
2016-11-02 08:13:54 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-09-13 15:50:14 -05:00
|
|
|
endif # SYSTEM_LIBJPEG
|
2011-04-01 15:49:35 -05:00
|
|
|
|
2014-02-11 12:25:30 -06:00
|
|
|
ifneq ($(SYSTEM_MYTHES),)
|
2012-10-28 11:00:06 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_mythes
|
2012-10-28 17:00:03 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(MYTHES_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(MYTHES_LIBS))
|
|
|
|
|
2012-10-28 11:00:06 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_MYTHES
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_mythes
|
2013-05-07 16:59:00 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/mythes \
|
2013-05-07 16:59:00 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
2012-10-28 16:40:30 -05:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
|
|
|
mythes \
|
2012-10-28 11:00:06 -05:00
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(MYTHES_LIBS))
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),mythes)
|
|
|
|
endif
|
2012-10-28 16:40:30 -05:00
|
|
|
|
2012-10-28 11:00:06 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_MYTHES
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
|
2014-02-11 09:33:18 -06:00
|
|
|
ifneq ($(SYSTEM_EXPAT),)
|
2011-04-01 15:49:35 -05:00
|
|
|
|
2013-04-09 02:22:20 -05:00
|
|
|
define gb_LinkTarget__use_expat_impl
|
|
|
|
$(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter))
|
2011-04-01 15:49:35 -05:00
|
|
|
|
2011-04-13 11:11:41 -05:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
2011-04-01 15:49:35 -05:00
|
|
|
-DSYSTEM_EXPAT \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),-lexpat)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-11-16 17:36:29 -06:00
|
|
|
gb_ExternalProject__use_expat :=
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
else # !SYSTEM_EXPAT
|
|
|
|
|
2013-04-09 02:22:20 -05:00
|
|
|
define gb_LinkTarget__use_expat_impl
|
|
|
|
$(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter))
|
2011-04-01 15:49:35 -05:00
|
|
|
|
2012-10-12 14:28:11 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/expat/lib \
|
2012-10-12 14:28:11 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
2012-04-07 16:22:08 -05:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
2011-04-01 15:49:35 -05:00
|
|
|
$(2) \
|
|
|
|
)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-11-16 17:36:29 -06:00
|
|
|
define gb_ExternalProject__use_expat
|
|
|
|
$(call gb_ExternalProject_use_static_libraries,$(1),expat)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endif # SYSTEM_EXPAT
|
|
|
|
|
2013-04-09 02:22:20 -05:00
|
|
|
define gb_LinkTarget__use_expat
|
|
|
|
$(call gb_LinkTarget__use_expat_impl,$(1),expat)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2013-04-09 02:22:20 -05:00
|
|
|
define gb_LinkTarget__use_expat_x64
|
|
|
|
$(call gb_LinkTarget__use_expat_impl,$(1),expat_x64)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2014-02-11 12:21:36 -06:00
|
|
|
ifneq ($(SYSTEM_HYPH),)
|
2012-11-03 12:54:46 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_hyphen
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(HYPHEN_LIB))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_HYPH
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_hyphen
|
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),hyphen)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/hyphen\
|
2012-11-03 12:54:46 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
2012-11-03 12:54:46 -05:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
|
|
|
hyphen \
|
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(HYPHEN_LIB))
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),hyphen)
|
|
|
|
endif
|
2012-11-03 12:54:46 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_HYPH
|
|
|
|
|
2014-02-11 12:21:36 -06:00
|
|
|
ifneq ($(SYSTEM_HUNSPELL),)
|
2011-12-03 07:44:12 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_hunspell
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(HUNSPELL_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(HUNSPELL_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-09-19 12:28:36 -05:00
|
|
|
gb_ExternalProject__use_hunspell :=
|
|
|
|
|
2011-12-03 07:44:12 -06:00
|
|
|
else # !SYSTEM_HUNSPELL
|
2021-04-30 10:26:41 -05:00
|
|
|
ifneq ($(ENABLE_WASM_STRIP_HUNSPELL),TRUE)
|
2011-12-03 07:44:12 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_hunspell
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DHUNSPELL_STATIC \
|
|
|
|
)
|
2012-10-29 17:29:37 -05:00
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),hunspell)
|
2011-12-03 07:44:12 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/hunspell/src/hunspell\
|
2012-10-29 17:29:37 -05:00
|
|
|
$$(INCLUDE) \
|
2011-12-03 07:44:12 -06:00
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
2012-04-07 16:22:08 -05:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
2012-10-28 16:40:30 -05:00
|
|
|
hunspell \
|
2011-12-03 07:44:12 -06:00
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(HUNSPELL_LIBS))
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),hunspell)
|
|
|
|
endif
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_hunspell
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),hunspell)
|
2011-12-03 07:44:12 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2021-04-30 10:26:41 -05:00
|
|
|
endif # ENABLE_WASM_STRIP_HUNSPELL
|
2011-12-03 07:44:12 -06:00
|
|
|
endif # SYSTEM_HUNSPELL
|
|
|
|
|
|
|
|
|
2014-02-11 11:40:09 -06:00
|
|
|
ifneq ($(SYSTEM_BOOST),)
|
2012-05-10 01:55:12 -05:00
|
|
|
|
2016-03-07 23:06:36 -06:00
|
|
|
define gb_LinkTarget__use_boost_lib
|
2012-06-06 10:04:01 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(BOOST_CPPFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_ldflags,$(1),\
|
|
|
|
$(BOOST_LDFLAGS) \
|
|
|
|
)
|
|
|
|
|
2016-03-07 23:06:36 -06:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(2))
|
2012-06-06 10:04:01 -05:00
|
|
|
|
2012-05-10 01:55:12 -05:00
|
|
|
endef
|
|
|
|
|
2017-04-19 06:02:25 -05:00
|
|
|
define gb_LinkTarget__use_boost_locale
|
|
|
|
$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_LOCALE_LIB))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2016-03-08 01:35:59 -06:00
|
|
|
define gb_LinkTarget__use_boost_date_time
|
2016-03-07 23:06:36 -06:00
|
|
|
$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_DATE_TIME_LIB))
|
2014-01-08 06:17:28 -06:00
|
|
|
|
2016-03-07 23:06:36 -06:00
|
|
|
endef
|
2014-01-08 06:17:28 -06:00
|
|
|
|
2016-03-07 23:08:36 -06:00
|
|
|
define gb_LinkTarget__use_boost_filesystem
|
|
|
|
$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_FILESYSTEM_LIB))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
gb_ExternalProject__use_boost_filesystem :=
|
|
|
|
|
2016-03-07 23:06:36 -06:00
|
|
|
define gb_LinkTarget__use_boost_iostreams
|
|
|
|
$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_IOSTREAMS_LIB))
|
2014-01-08 06:17:28 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-03-03 13:39:13 -06:00
|
|
|
gb_ExternalProject__use_boost_iostreams :=
|
|
|
|
|
2014-01-08 06:17:28 -06:00
|
|
|
define gb_LinkTarget__use_boost_system
|
2016-03-07 23:06:36 -06:00
|
|
|
$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_SYSTEM_LIB))
|
2013-05-22 11:50:22 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-01-08 06:17:28 -06:00
|
|
|
gb_ExternalProject__use_boost_system :=
|
2013-05-22 11:50:22 -05:00
|
|
|
|
2013-02-16 15:56:19 -06:00
|
|
|
define gb_LinkTarget__use_boost_headers
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(BOOST_CPPFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-11-10 07:56:12 -06:00
|
|
|
gb_ExternalProject__use_boost_headers:=
|
|
|
|
|
2012-05-10 01:55:12 -05:00
|
|
|
else # !SYSTEM_BOOST
|
|
|
|
|
2016-03-07 23:06:36 -06:00
|
|
|
define gb_LinkTarget__use_boost_lib
|
2012-09-06 13:22:11 -05:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DBOOST_ALL_NO_LIB \
|
|
|
|
)
|
|
|
|
|
2016-03-07 23:06:36 -06:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),$(2))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-04-19 06:02:25 -05:00
|
|
|
define gb_LinkTarget__use_boost_locale
|
|
|
|
$(call gb_LinkTarget__use_boost_lib,$(1),boost_locale)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(if $(filter $(OS),MACOSX),-liconv) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2016-03-08 01:35:59 -06:00
|
|
|
define gb_LinkTarget__use_boost_date_time
|
|
|
|
$(call gb_LinkTarget__use_boost_lib,$(1),boost_date_time)
|
2012-05-10 01:55:12 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2016-03-07 22:57:40 -06:00
|
|
|
define gb_LinkTarget__use_boost_filesystem
|
2016-03-07 23:06:36 -06:00
|
|
|
$(call gb_LinkTarget__use_boost_lib,$(1),boost_filesystem)
|
2016-03-07 22:57:40 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_boost_filesystem
|
|
|
|
$(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem)
|
|
|
|
endef
|
|
|
|
|
2014-01-08 06:17:28 -06:00
|
|
|
define gb_LinkTarget__use_boost_iostreams
|
2016-03-07 23:06:36 -06:00
|
|
|
$(call gb_LinkTarget__use_boost_lib,$(1),boost_iostreams)
|
2014-01-08 06:17:28 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_boost_iostreams
|
|
|
|
$(call gb_ExternalProject_use_static_libraries,$(1),boost_iostreams)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_boost_system
|
2016-03-07 23:06:36 -06:00
|
|
|
$(call gb_LinkTarget__use_boost_lib,$(1),boost_system)
|
2013-05-22 11:50:22 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-01-08 06:17:28 -06:00
|
|
|
define gb_ExternalProject__use_boost_system
|
|
|
|
$(call gb_ExternalProject_use_static_libraries,$(1),boost_system)
|
2013-05-22 11:50:22 -05:00
|
|
|
endef
|
|
|
|
|
2012-11-12 17:37:10 -06:00
|
|
|
define gb_LinkTarget__use_boost_headers
|
2012-11-14 11:11:30 -06:00
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),boost)
|
2013-01-26 14:19:13 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2016-05-31 06:32:15 -05:00
|
|
|
$(BOOST_CPPFLAGS) \
|
2013-01-26 14:19:13 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2012-11-12 17:37:10 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-11-10 07:56:12 -06:00
|
|
|
define gb_ExternalProject__use_boost_headers
|
2015-06-24 08:11:40 -05:00
|
|
|
$(call gb_ExternalProject_use_unpacked,$(1),boost)
|
2012-11-10 07:56:12 -06:00
|
|
|
|
|
|
|
endef
|
2016-03-07 22:57:40 -06:00
|
|
|
|
2012-05-10 01:55:12 -05:00
|
|
|
endif # SYSTEM_BOOST
|
|
|
|
|
|
|
|
|
2017-09-13 16:44:32 -05:00
|
|
|
ifneq ($(SYSTEM_LIBCMIS),)
|
2012-01-14 19:12:49 -06:00
|
|
|
|
2017-09-13 16:44:32 -05:00
|
|
|
define gb_LinkTarget__use_libcmis
|
2012-01-14 19:12:49 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2017-09-13 16:44:32 -05:00
|
|
|
$(LIBCMIS_CFLAGS) \
|
2012-01-14 19:12:49 -06:00
|
|
|
)
|
2017-09-13 16:44:32 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBCMIS_LIBS))
|
2012-01-14 19:12:49 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-09-13 16:44:32 -05:00
|
|
|
else # !SYSTEM_LIBCMIS
|
2012-01-14 19:12:49 -06:00
|
|
|
|
2017-09-13 16:44:32 -05:00
|
|
|
define gb_LinkTarget__use_libcmis
|
2013-05-07 17:55:21 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libcmis/inc \
|
2013-05-07 17:55:21 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2012-04-07 16:22:08 -05:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
2017-09-13 16:44:32 -05:00
|
|
|
libcmis \
|
2012-01-14 19:12:49 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-09-13 16:44:32 -05:00
|
|
|
endif # SYSTEM_LIBCMIS
|
2012-01-14 19:12:49 -06:00
|
|
|
|
2014-04-26 12:46:40 -05:00
|
|
|
ifeq ($(ENABLE_JAVA),TRUE)
|
2014-04-26 09:08:07 -05:00
|
|
|
|
2012-12-25 10:23:58 -06:00
|
|
|
define gb_LinkTarget__use_jawt
|
2014-04-26 08:50:10 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2014-04-26 09:08:07 -05:00
|
|
|
$(JAWTLIB) \
|
2012-12-25 10:23:58 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-04-26 09:08:07 -05:00
|
|
|
else # !ENABLE_JAVA
|
|
|
|
|
|
|
|
gb_LinkTarget__use_jawt :=
|
|
|
|
|
|
|
|
endif # ENABLE_JAVA
|
2012-01-14 19:12:49 -06:00
|
|
|
|
2014-02-11 12:04:20 -06:00
|
|
|
ifneq ($(SYSTEM_LIBATOMIC_OPS),)
|
2013-06-14 08:55:22 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_libatomic_ops
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(LIBATOMIC_OPS_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1), $(LIBATOMIC_OPS_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
gb_ExternalProject__use_libatomic_ops :=
|
|
|
|
|
|
|
|
else # !SYSTEM_LIBATOMIC_OPS
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_libatomic_ops
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(LIBATOMIC_OPS_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(LIBATOMIC_OPS_CFLAGS) \
|
|
|
|
)
|
2013-10-24 05:22:58 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),\
|
2013-06-14 08:55:22 -05:00
|
|
|
libatomic_ops \
|
|
|
|
)
|
2013-09-05 10:27:50 -05:00
|
|
|
|
2013-10-24 05:22:58 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/libatomic_ops/src/lib -latomic_ops \
|
2013-10-24 05:22:58 -05:00
|
|
|
)
|
2013-06-14 08:55:22 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_libatomic_ops
|
2013-10-24 05:22:58 -05:00
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libatomic_ops)
|
2013-06-14 08:55:22 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_LIBATOMIC_OPS
|
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_LIBEXTTEXTCAT),)
|
2011-12-03 08:06:52 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_libexttextcat
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(LIBEXTTEXTCAT_CFLAGS) \
|
|
|
|
)
|
2012-11-09 16:25:56 -06:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DSYSTEM_LIBEXTTEXTCAT \
|
|
|
|
)
|
2011-12-03 08:06:52 -06:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBEXTTEXTCAT_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_LIBEXTTEXTCAT
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_libexttextcat
|
2012-11-09 16:25:56 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libexttextcat/src \
|
2012-11-09 16:25:56 -06:00
|
|
|
$$(INCLUDE) \
|
2011-12-03 08:06:52 -06:00
|
|
|
)
|
|
|
|
|
2013-09-19 12:28:36 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
2017-09-13 16:57:54 -05:00
|
|
|
libexttextcat \
|
2013-09-19 12:28:36 -05:00
|
|
|
)
|
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libexttextcat/src/.libs/libexttextcat-2.0.a\
|
2013-09-19 12:28:36 -05:00
|
|
|
)
|
2017-09-13 16:57:54 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libexttextcat)
|
2013-09-19 12:28:36 -05:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
2011-12-03 08:06:52 -06:00
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_LIBEXTTEXTCAT
|
|
|
|
|
|
|
|
|
2018-02-20 04:38:24 -06:00
|
|
|
ifneq ($(SYSTEM_LIBNUMBERTEXT),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_libnumbertext
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(LIBNUMBERTEXT_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DSYSTEM_LIBNUMBERTEXT \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBNUMBERTEXT_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_LIBNUMBERTEXT
|
|
|
|
|
2018-08-21 17:47:13 -05:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
|
|
|
|
libnumbertext_numbertext \
|
|
|
|
))
|
|
|
|
|
2018-02-20 04:38:24 -06:00
|
|
|
define gb_LinkTarget__use_libnumbertext
|
2018-05-15 09:39:01 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),libnumbertext_numbertext)
|
2018-02-20 04:38:24 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libnumbertext/src \
|
2018-02-20 04:38:24 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
|
|
|
libnumbertext \
|
|
|
|
)
|
|
|
|
else
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libnumbertext/src/.libs/libnumbertext-1.0.a\
|
2018-02-20 04:38:24 -06:00
|
|
|
)
|
2018-05-04 03:21:23 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libnumbertext,full)
|
2018-02-20 04:38:24 -06:00
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_LIBNUMBERTEXT
|
|
|
|
|
|
|
|
|
2014-02-11 09:49:19 -06:00
|
|
|
ifneq ($(SYSTEM_LIBXML),)
|
2011-04-01 15:49:35 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_libxml2
|
2011-04-13 11:11:41 -05:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
2011-04-01 15:49:35 -05:00
|
|
|
-DSYSTEM_LIBXML \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(LIBXML_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBXML_LIBS))
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
2013-02-05 16:19:11 -06:00
|
|
|
gb_ExternalProject__use_libxml2:=
|
2011-04-01 15:49:35 -05:00
|
|
|
|
|
|
|
else # !SYSTEM_LIBXML
|
|
|
|
|
2014-03-14 05:48:24 -05:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ure,\
|
2017-09-14 07:54:07 -05:00
|
|
|
libxml2 \
|
2014-03-14 05:48:24 -05:00
|
|
|
))
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
define gb_LinkTarget__use_libxml2
|
2017-09-14 07:54:07 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),libxml2)
|
2013-02-05 16:19:11 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2014-07-17 10:27:05 -05:00
|
|
|
$(LIBXML_CFLAGS) \
|
2013-02-05 16:19:11 -06:00
|
|
|
)
|
|
|
|
|
2013-10-22 11:02:28 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2014-07-17 10:27:05 -05:00
|
|
|
$(LIBXML_LIBS) \
|
2013-10-22 11:02:28 -05:00
|
|
|
)
|
2014-07-17 10:27:05 -05:00
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_use_external,$(1),icu_headers)
|
2013-10-22 11:02:28 -05:00
|
|
|
endif
|
|
|
|
|
2013-02-05 16:19:11 -06:00
|
|
|
endef
|
|
|
|
define gb_ExternalProject__use_libxml2
|
2017-09-14 07:54:07 -05:00
|
|
|
$(call gb_ExternalProject_use_package,$(1),libxml2)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2014-07-17 10:27:05 -05:00
|
|
|
ifeq ($(COM),MSC)
|
2018-01-19 07:13:34 -06:00
|
|
|
$(call gb_ExternalProject_use_packages,$(1),icu icu_ure)
|
2014-07-17 10:27:05 -05:00
|
|
|
endif
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_LIBXML
|
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_LIBXSLT),)
|
2011-04-01 15:49:35 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_libxslt
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(LIBXSLT_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBXSLT_LIBS))
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 00:20:13 -05:00
|
|
|
define gb_LinkTarget__use_libexslt
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(LIBEXSLT_CFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBEXSLT_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
else # !SYSTEM_LIBXSLT
|
|
|
|
|
2014-02-17 04:23:19 -06:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
2017-09-14 08:26:10 -05:00
|
|
|
libxslt \
|
2014-02-17 04:23:19 -06:00
|
|
|
))
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
define gb_LinkTarget__use_libxslt
|
2017-09-14 08:26:10 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),libxslt)
|
2013-02-02 14:44:30 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libxslt \
|
2013-02-02 14:44:30 -06:00
|
|
|
)
|
2013-10-22 11:02:28 -05:00
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libxslt/win32/bin.msvc/libxslt.lib \
|
2011-04-01 15:49:35 -05:00
|
|
|
)
|
2013-10-22 11:02:28 -05:00
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/libxslt/libxslt/.libs -lxslt \
|
2013-10-22 11:02:28 -05:00
|
|
|
)
|
|
|
|
endif
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 00:20:13 -05:00
|
|
|
define gb_LinkTarget__use_libexslt
|
2017-09-14 08:26:10 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),libxslt)
|
2013-02-02 14:44:30 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libxslt \
|
2013-02-02 14:44:30 -06:00
|
|
|
)
|
|
|
|
|
2013-10-22 11:02:28 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libxslt/win32/bin.msvc/libexslt.lib \
|
2012-08-15 00:20:13 -05:00
|
|
|
)
|
2013-10-22 11:02:28 -05:00
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/libxslt/libexslt/.libs -lexslt \
|
2013-10-22 11:02:28 -05:00
|
|
|
)
|
|
|
|
endif
|
2012-08-15 00:20:13 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endif # SYSTEM_LIBXSLT
|
|
|
|
|
2012-08-10 03:27:54 -05:00
|
|
|
|
2017-06-21 14:59:11 -05:00
|
|
|
ifneq ($(SYSTEM_XMLSEC),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_xmlsec
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DSYSTEM_XMLSEC \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(XMLSEC_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(XMLSEC_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
gb_ExternalProject__use_xmlsec:=
|
|
|
|
|
|
|
|
else # !SYSTEM_XMLSEC
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
|
|
|
xmlsec \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_xmlsec
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_XMLSEC
|
|
|
|
|
2014-02-11 12:42:28 -06:00
|
|
|
ifneq ($(SYSTEM_LIBLANGTAG),)
|
2012-08-06 12:22:43 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_liblangtag
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(LIBLANGTAG_CFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBLANGTAG_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2016-01-13 07:24:31 -06:00
|
|
|
gb_ExternalProject__use_liblangtag :=
|
|
|
|
|
2012-08-06 12:22:43 -05:00
|
|
|
else # !SYSTEM_LIBLANGTAG
|
|
|
|
|
Move i18nlangtag lib to URELIB
...as stoc/Library_javavm.mk depends on it since
9b09a217c79e8a35fc4de54c89ef49fbf8f72752 "Resolves: #i86470# Wrong Java locale
when using 'nl' and 'fr'". The i18nlangtag lib in turn depends on libs from
external/liblangtag and external/icu, so those needed to be moved to URELIB,
too.
On Windows, the external icu package was already split into icu and icu_ure
(because "libxml2 is in URE and depends on icuuc*.dll on Windows"), so use that
splitting on all platforms. (However, the corresponding changes that were
necessary in RepositoryExternal.mk suggest that they had been missing for the
split Windows case until now, and things had happened to work by accident?)
On macOS, a library's install name reflects its (URELIB, OOO, ...) layer, and in
external/icu/icu4c-build.patch there is only a single place to set that for all
libs from external/icu. This patch changes that from OOO to URELIB, but for the
icui18n lib that should stay at OOO. The hack to make it URELIB nonetheless
works for now. To clean this up again, either the whole of icu could go into
URE (dropping the icu vs. icu_ure package split completely), or the macOS layers
URELIB and OOO could be combined into one (as the libs end up in the same
directory anyway).
Change-Id: Idc262fa41481d06ba2cae86ad7629cdccb392c07
Reviewed-on: https://gerrit.libreoffice.org/30272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-25 09:46:35 -05:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ure,\
|
2014-03-18 11:38:06 -05:00
|
|
|
liblangtag_data \
|
|
|
|
))
|
|
|
|
|
2016-01-13 08:45:17 -06:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
|
2012-08-06 12:22:43 -05:00
|
|
|
define gb_LinkTarget__use_liblangtag
|
2012-11-11 15:02:36 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2016-01-13 07:21:10 -06:00
|
|
|
$(LIBLANGTAG_CFLAGS) \
|
2012-11-11 15:02:36 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBLANGTAG_LIBS))
|
2017-09-14 05:20:31 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),liblangtag)
|
2012-08-06 12:22:43 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2016-01-13 08:45:17 -06:00
|
|
|
else
|
|
|
|
|
Move i18nlangtag lib to URELIB
...as stoc/Library_javavm.mk depends on it since
9b09a217c79e8a35fc4de54c89ef49fbf8f72752 "Resolves: #i86470# Wrong Java locale
when using 'nl' and 'fr'". The i18nlangtag lib in turn depends on libs from
external/liblangtag and external/icu, so those needed to be moved to URELIB,
too.
On Windows, the external icu package was already split into icu and icu_ure
(because "libxml2 is in URE and depends on icuuc*.dll on Windows"), so use that
splitting on all platforms. (However, the corresponding changes that were
necessary in RepositoryExternal.mk suggest that they had been missing for the
split Windows case until now, and things had happened to work by accident?)
On macOS, a library's install name reflects its (URELIB, OOO, ...) layer, and in
external/icu/icu4c-build.patch there is only a single place to set that for all
libs from external/icu. This patch changes that from OOO to URELIB, but for the
icui18n lib that should stay at OOO. The hack to make it URELIB nonetheless
works for now. To clean this up again, either the whole of icu could go into
URE (dropping the icu vs. icu_ure package split completely), or the macOS layers
URELIB and OOO could be combined into one (as the libs end up in the same
directory anyway).
Change-Id: Idc262fa41481d06ba2cae86ad7629cdccb392c07
Reviewed-on: https://gerrit.libreoffice.org/30272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-25 09:46:35 -05:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ure,\
|
2016-01-13 08:45:17 -06:00
|
|
|
liblangtag \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_liblangtag
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(LIBLANGTAG_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBLANGTAG_LIBS))
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),liblangtag)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # MSC
|
|
|
|
|
2016-01-13 07:24:31 -06:00
|
|
|
define gb_ExternalProject__use_liblangtag
|
2017-09-14 05:20:31 -05:00
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),liblangtag)
|
2016-01-13 07:24:31 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-08-06 12:22:43 -05:00
|
|
|
endif # SYSTEM_LIBLANGTAG
|
|
|
|
|
2012-08-10 03:27:54 -05:00
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_REDLAND),)
|
2011-04-01 15:49:35 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_librdf
|
2011-04-13 11:11:41 -05:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
2011-04-01 15:49:35 -05:00
|
|
|
-DSYSTEM_REDLAND \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(REDLAND_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(REDLAND_LIBS))
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-12-27 17:04:21 -06:00
|
|
|
gb_LinkTarget__use_redland_headers:=
|
|
|
|
|
|
|
|
gb_LinkTarget__use_raptor_headers:=
|
|
|
|
|
|
|
|
gb_LinkTarget__use_rasqal_headers:=
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
else # !SYSTEM_REDLAND
|
|
|
|
|
2012-12-27 17:04:21 -06:00
|
|
|
define gb_LinkTarget__use_redland_headers
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/redland/src \
|
2012-12-27 17:04:21 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_raptor_headers
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/raptor/src \
|
2012-12-27 17:04:21 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_rasqal_headers
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/rasqal/src \
|
2012-12-27 17:04:21 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-04-19 13:45:14 -05:00
|
|
|
ifneq ($(OS),ANDROID)
|
|
|
|
|
2013-11-01 09:43:47 -05:00
|
|
|
ifeq ($(COM),MSC)
|
2014-01-10 05:07:31 -06:00
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
|
2013-05-01 04:23:50 -05:00
|
|
|
raptor2 \
|
|
|
|
rasqal \
|
2011-04-01 15:49:35 -05:00
|
|
|
rdf \
|
|
|
|
))
|
2014-03-13 13:32:13 -05:00
|
|
|
else
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
|
|
|
|
raptor \
|
|
|
|
rasqal \
|
|
|
|
redland \
|
|
|
|
))
|
2013-11-01 09:43:47 -05:00
|
|
|
endif
|
2011-04-01 15:49:35 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_librdf
|
2013-10-23 18:09:35 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
raptor2 \
|
|
|
|
rdf \
|
|
|
|
)
|
|
|
|
else
|
2016-12-19 15:17:48 -06:00
|
|
|
$(call gb_LinkTarget_use_packages,$(1),redland raptor rasqal)
|
2013-12-14 04:17:30 -06:00
|
|
|
|
2013-10-23 14:18:24 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/redland/src/.libs -lrdf \
|
|
|
|
-L$(gb_UnpackedTarball_workdir)/raptor/src/.libs -lraptor2 \
|
|
|
|
-L$(gb_UnpackedTarball_workdir)/rasqal/src/.libs -lrasqal \
|
2011-04-01 15:49:35 -05:00
|
|
|
)
|
2013-10-23 18:09:35 -05:00
|
|
|
endif
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-04-19 13:45:14 -05:00
|
|
|
else # ANDROID
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_librdf
|
2016-12-19 15:17:48 -06:00
|
|
|
$(call gb_LinkTarget_use_packages,$(1),redland raptor rasqal)
|
2012-04-19 13:45:14 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # ANDROID
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endif # SYSTEM_REDLAND
|
|
|
|
|
2014-02-11 10:03:53 -06:00
|
|
|
ifneq ($(SYSTEM_CAIRO),)
|
2011-04-01 15:49:35 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_cairo
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(CAIRO_CFLAGS) \
|
2024-10-17 06:53:12 -05:00
|
|
|
-DSYSTEM_CAIRO \
|
2011-04-01 15:49:35 -05:00
|
|
|
)
|
2013-05-24 07:35:18 -05:00
|
|
|
$(call gb_LinkTarget_use_external,$(1),freetype_headers)
|
2011-04-01 15:49:35 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS))
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2014-02-11 10:03:53 -06:00
|
|
|
else # !SYSTEM_CAIRO
|
2011-04-01 15:49:35 -05:00
|
|
|
|
2021-06-08 13:04:46 -05:00
|
|
|
ifneq ($(filter-out MACOSX WNT,$(OS)),)
|
|
|
|
|
2014-02-17 04:23:19 -06:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
|
|
|
cairo \
|
2021-06-01 11:53:40 -05:00
|
|
|
pixman \
|
2014-02-17 04:23:19 -06:00
|
|
|
))
|
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
define gb_LinkTarget__use_cairo
|
2012-11-20 15:05:36 -06:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),cairo)
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),pixman)
|
2013-05-24 07:35:18 -05:00
|
|
|
$(call gb_LinkTarget_use_external,$(1),freetype_headers)
|
2011-04-01 15:49:35 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/cairo \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/cairo/src \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/pixman/pixman \
|
2012-11-10 15:14:42 -06:00
|
|
|
$$(INCLUDE) \
|
2011-04-01 15:49:35 -05:00
|
|
|
)
|
2013-10-23 14:27:05 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2022-11-28 16:37:15 -06:00
|
|
|
$(if $(filter EMSCRIPTEN,$(OS)), \
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/cairo/src/.libs/libcairo.a \
|
|
|
|
$(gb_UnpackedTarball_workdir)/pixman/pixman/.libs/libpixman-1.a, \
|
|
|
|
-L$(gb_UnpackedTarball_workdir)/cairo/src/.libs -lcairo \
|
|
|
|
-L$(gb_UnpackedTarball_workdir)/pixman/pixman/.libs -lpixman-1) \
|
2011-04-01 15:49:35 -05:00
|
|
|
)
|
2011-07-25 15:50:34 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
2021-06-08 13:04:46 -05:00
|
|
|
endif # !MACOSX, !WNT
|
|
|
|
|
2021-06-01 12:29:58 -05:00
|
|
|
endif # !SYSTEM_CAIRO
|
2014-02-17 04:23:19 -06:00
|
|
|
|
2014-02-11 09:49:19 -06:00
|
|
|
ifneq ($(SYSTEM_FREETYPE),)
|
2013-05-24 07:35:18 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_freetype_headers
|
2011-07-25 16:24:27 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(FREETYPE_CFLAGS) \
|
|
|
|
)
|
2012-04-19 13:10:00 -05:00
|
|
|
|
2013-05-24 07:35:18 -05:00
|
|
|
endef
|
|
|
|
|
2013-09-30 07:10:22 -05:00
|
|
|
gb_ExternalProject__use_freetype :=
|
|
|
|
|
2016-12-19 02:59:02 -06:00
|
|
|
else
|
2013-05-24 07:35:18 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_freetype_headers
|
2013-10-24 05:08:50 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),freetype)
|
2013-05-24 07:35:18 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2017-02-02 06:31:13 -06:00
|
|
|
$(FREETYPE_CFLAGS) \
|
2013-05-24 07:35:18 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
2013-05-24 10:15:20 -05:00
|
|
|
endef
|
|
|
|
|
2013-09-30 07:10:22 -05:00
|
|
|
define gb_ExternalProject__use_freetype
|
2013-10-24 05:08:50 -05:00
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),freetype)
|
2013-09-30 07:10:22 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-05-24 07:35:18 -05:00
|
|
|
endif # SYSTEM_FREETYPE
|
|
|
|
|
2017-02-02 06:31:13 -06:00
|
|
|
define gb_LinkTarget__use_freetype
|
|
|
|
$(call gb_LinkTarget_use_external,$(1),freetype_headers)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-02-11 09:21:04 -06:00
|
|
|
ifneq ($(SYSTEM_FONTCONFIG),)
|
2013-05-24 07:16:03 -05:00
|
|
|
|
2011-07-25 16:24:27 -05:00
|
|
|
define gb_LinkTarget__use_fontconfig
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(FONTCONFIG_CFLAGS) \
|
|
|
|
)
|
2012-04-19 13:10:00 -05:00
|
|
|
|
2011-07-25 16:24:27 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
|
2013-05-24 07:16:03 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2021-11-30 11:58:10 -06:00
|
|
|
ifeq ($(OS),EMSCRIPTEN)
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
|
|
|
libfontconfig_data \
|
|
|
|
))
|
|
|
|
endif
|
|
|
|
|
2021-06-01 12:29:58 -05:00
|
|
|
gb_ExternalProject__use_fontconfig :=
|
|
|
|
|
2021-11-30 11:58:10 -06:00
|
|
|
else # SYSTEM_FONTCONFIG
|
2013-05-24 07:16:03 -05:00
|
|
|
|
2022-10-20 03:20:12 -05:00
|
|
|
ifneq ($(filter-out MACOSX WNT,$(OS)),)
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
|
|
|
fontconfig \
|
|
|
|
))
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
2013-05-24 07:16:03 -05:00
|
|
|
define gb_LinkTarget__use_fontconfig
|
2023-03-07 03:13:25 -06:00
|
|
|
ifeq ($(OS),LINUX)
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),fontconfig)
|
|
|
|
else
|
2013-10-24 04:01:41 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),fontconfig)
|
2023-03-07 03:13:25 -06:00
|
|
|
endif
|
2013-05-24 07:16:03 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/fontconfig \
|
2013-05-24 07:16:03 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
2016-12-20 05:37:13 -06:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/fontconfig/src/.libs -lfontconfig \
|
2016-12-20 05:37:13 -06:00
|
|
|
)
|
2016-12-19 02:59:02 -06:00
|
|
|
|
2011-07-25 16:24:27 -05:00
|
|
|
endef
|
2011-04-01 15:49:35 -05:00
|
|
|
|
2021-06-01 12:29:58 -05:00
|
|
|
define gb_ExternalProject__use_fontconfig
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),fontconfig)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-05-24 07:16:03 -05:00
|
|
|
endif # SYSTEM_FONTCONFIG
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_GRAPHITE),)
|
2011-04-13 11:11:39 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_graphite
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(GRAPHITE_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS))
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-13 11:11:39 -05:00
|
|
|
endef
|
|
|
|
|
2016-09-23 11:34:09 -05:00
|
|
|
gb_ExternalProject__use_graphite:=
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
else # !SYSTEM_GRAPHITE
|
2011-04-13 11:11:39 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_graphite
|
2012-10-29 17:29:37 -05:00
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),graphite)
|
2012-10-25 02:55:13 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/graphite/include \
|
2012-10-25 02:55:13 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2012-04-07 16:22:08 -05:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
2012-10-25 02:55:13 -05:00
|
|
|
graphite \
|
2011-04-13 11:11:39 -05:00
|
|
|
)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-13 11:11:39 -05:00
|
|
|
endef
|
|
|
|
|
2016-09-23 11:34:09 -05:00
|
|
|
define gb_ExternalProject__use_graphite
|
2016-11-03 11:23:56 -05:00
|
|
|
$(call gb_ExternalProject_use_static_libraries,$(1),\
|
|
|
|
graphite \
|
|
|
|
)
|
2016-09-23 11:34:09 -05:00
|
|
|
|
|
|
|
endef
|
2011-04-13 11:11:39 -05:00
|
|
|
endif # SYSTEM_GRAPHITE
|
|
|
|
|
2014-02-11 12:17:42 -06:00
|
|
|
ifneq ($(SYSTEM_ICU),)
|
2011-04-01 15:49:35 -05:00
|
|
|
|
2012-12-25 16:39:43 -06:00
|
|
|
gb_LinkTarget__use_icu_headers:=
|
2013-01-25 03:55:04 -06:00
|
|
|
gb_ExternalProject__use_icu:=
|
2012-12-25 16:39:43 -06:00
|
|
|
|
2011-08-11 05:42:39 -05:00
|
|
|
define gb_LinkTarget__use_icudata
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),-licudata)
|
|
|
|
|
|
|
|
endef
|
2011-07-26 02:58:54 -05:00
|
|
|
define gb_LinkTarget__use_icui18n
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),-licui18n)
|
2011-08-11 05:42:39 -05:00
|
|
|
|
2011-04-13 11:11:40 -05:00
|
|
|
endef
|
2011-04-01 15:49:35 -05:00
|
|
|
define gb_LinkTarget__use_icuuc
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),-licuuc)
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_ICU
|
|
|
|
|
2014-07-23 17:22:51 -05:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ure, \
|
|
|
|
icu_ure \
|
|
|
|
))
|
|
|
|
|
2014-03-14 05:23:52 -05:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
|
|
|
|
icu \
|
|
|
|
))
|
|
|
|
|
2012-09-24 02:37:25 -05:00
|
|
|
ifeq ($(OS)$(DISABLE_DYNLOADING),ANDROID)
|
2011-11-21 06:25:37 -06:00
|
|
|
gb_ICU_suffix:=lo
|
|
|
|
else
|
|
|
|
gb_ICU_suffix:=
|
|
|
|
endif
|
|
|
|
|
2012-12-25 16:39:43 -06:00
|
|
|
define gb_LinkTarget__use_icu_headers
|
2013-03-23 11:32:31 -05:00
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),icu)
|
2012-12-25 16:39:43 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/icu/source \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/icu/source/i18n \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/icu/source/common \
|
2012-12-25 16:39:43 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-01-25 03:55:04 -06:00
|
|
|
define gb_ExternalProject__use_icu
|
|
|
|
$(call gb_ExternalProject_use_package,$(1),icu)
|
2013-01-25 03:29:59 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-11-04 07:46:44 -06:00
|
|
|
# icudata and icui18n is called icudt and icuin when built with MSVC :-/
|
2011-08-11 05:42:39 -05:00
|
|
|
define gb_LinkTarget__use_icudata
|
Move i18nlangtag lib to URELIB
...as stoc/Library_javavm.mk depends on it since
9b09a217c79e8a35fc4de54c89ef49fbf8f72752 "Resolves: #i86470# Wrong Java locale
when using 'nl' and 'fr'". The i18nlangtag lib in turn depends on libs from
external/liblangtag and external/icu, so those needed to be moved to URELIB,
too.
On Windows, the external icu package was already split into icu and icu_ure
(because "libxml2 is in URE and depends on icuuc*.dll on Windows"), so use that
splitting on all platforms. (However, the corresponding changes that were
necessary in RepositoryExternal.mk suggest that they had been missing for the
split Windows case until now, and things had happened to work by accident?)
On macOS, a library's install name reflects its (URELIB, OOO, ...) layer, and in
external/icu/icu4c-build.patch there is only a single place to set that for all
libs from external/icu. This patch changes that from OOO to URELIB, but for the
icui18n lib that should stay at OOO. The hack to make it URELIB nonetheless
works for now. To clean this up again, either the whole of icu could go into
URE (dropping the icu vs. icu_ure package split completely), or the macOS layers
URELIB and OOO could be combined into one (as the libs end up in the same
directory anyway).
Change-Id: Idc262fa41481d06ba2cae86ad7629cdccb392c07
Reviewed-on: https://gerrit.libreoffice.org/30272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-25 09:46:35 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),icu_ure)
|
2013-10-23 08:00:29 -05:00
|
|
|
|
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/icu/source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
|
2013-10-23 08:00:29 -05:00
|
|
|
)
|
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/icu/source/lib -licudata$(gb_ICU_suffix) \
|
2011-08-11 05:42:39 -05:00
|
|
|
)
|
2013-10-23 08:00:29 -05:00
|
|
|
endif
|
2011-08-11 05:42:39 -05:00
|
|
|
|
|
|
|
endef
|
2013-10-23 08:00:29 -05:00
|
|
|
|
2011-07-26 02:58:54 -05:00
|
|
|
define gb_LinkTarget__use_icui18n
|
2012-12-31 14:12:11 -06:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),icu)
|
2011-08-11 05:42:39 -05:00
|
|
|
|
2013-10-23 08:00:29 -05:00
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/icu/source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
|
2013-10-23 08:00:29 -05:00
|
|
|
)
|
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/icu/source/lib -licui18n$(gb_ICU_suffix) \
|
2013-10-23 08:00:29 -05:00
|
|
|
)
|
2011-08-19 02:32:18 -05:00
|
|
|
endif
|
|
|
|
|
2013-10-23 08:00:29 -05:00
|
|
|
endef
|
2012-12-02 11:56:17 -06:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
define gb_LinkTarget__use_icuuc
|
Move i18nlangtag lib to URELIB
...as stoc/Library_javavm.mk depends on it since
9b09a217c79e8a35fc4de54c89ef49fbf8f72752 "Resolves: #i86470# Wrong Java locale
when using 'nl' and 'fr'". The i18nlangtag lib in turn depends on libs from
external/liblangtag and external/icu, so those needed to be moved to URELIB,
too.
On Windows, the external icu package was already split into icu and icu_ure
(because "libxml2 is in URE and depends on icuuc*.dll on Windows"), so use that
splitting on all platforms. (However, the corresponding changes that were
necessary in RepositoryExternal.mk suggest that they had been missing for the
split Windows case until now, and things had happened to work by accident?)
On macOS, a library's install name reflects its (URELIB, OOO, ...) layer, and in
external/icu/icu4c-build.patch there is only a single place to set that for all
libs from external/icu. This patch changes that from OOO to URELIB, but for the
icui18n lib that should stay at OOO. The hack to make it URELIB nonetheless
works for now. To clean this up again, either the whole of icu could go into
URE (dropping the icu vs. icu_ure package split completely), or the macOS layers
URELIB and OOO could be combined into one (as the libs end up in the same
directory anyway).
Change-Id: Idc262fa41481d06ba2cae86ad7629cdccb392c07
Reviewed-on: https://gerrit.libreoffice.org/30272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-25 09:46:35 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),icu_ure)
|
2013-10-23 08:00:29 -05:00
|
|
|
|
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/icu/source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
|
2011-04-01 15:49:35 -05:00
|
|
|
)
|
2013-10-23 08:00:29 -05:00
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/icu/source/lib -licuuc$(gb_ICU_suffix) \
|
2013-10-23 08:00:29 -05:00
|
|
|
)
|
|
|
|
endif
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-01 15:49:35 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_ICU
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_HARFBUZZ),)
|
2013-04-20 06:00:56 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_harfbuzz
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(HARFBUZZ_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(HARFBUZZ_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-02-01 05:32:35 -06:00
|
|
|
gb_ExternalProject__use_harfbuzz :=
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
else # SYSTEM_HARFBUZZ != TRUE
|
2013-04-20 06:00:56 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_harfbuzz
|
2013-05-07 16:28:45 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2013-09-19 12:28:36 -05:00
|
|
|
$(HARFBUZZ_CFLAGS) \
|
2013-05-07 16:28:45 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(HARFBUZZ_LIBS))
|
external/harfbuzz's libharfbuzz.a links against icuuc library
buovjaga reported on IRC that his build (implicitly --without-system-harfbuzz
--without-system-icu) failed to link e.g. Library_vclplug_gtk3 due to harfbuzz
missing symbols from ICU, like
> /usr/bin/ld: /home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a(libharfbuzz_la-hb-icu.o): in function `hb_icu_unicode_decompose_compatibility(hb_unicode_funcs_t*, unsigned int, unsigned int*, void*)':
> /home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/hb-icu.cc:334: undefined reference to `unorm2_getNFKDInstance_62'
[...]
It is not clear to me why Library_vclplug_gtk3 would actually use
libharfbuzz.a's hb_icu_unicode_decompose_compatibility (and for e.g. my builds,
it apparently doesn't), but in general libharfbuzz.a does depend on some symbols
from icuuc, so it is correct to add icuuc to the link when linking against
harfbuzz. (And "gb_LinkTarget_use_external,...,icuuc" conveniently only adds
libs for linking, and does not add C/C++ include file paths, which would not be
wanted here.)
(<https://gerrit.libreoffice.org/#/c/60882/> "Revert 'Add more more dependencies
to VCL makefiles'" was a false start trying to address the above issue.)
Change-Id: Ic8bcfa2aab185f8a9487d7787b4f22068e7cb481
Reviewed-on: https://gerrit.libreoffice.org/60898
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-09-22 10:30:36 -05:00
|
|
|
$(call gb_LinkTarget_use_external,$(1),icuuc)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),harfbuzz)
|
2013-04-20 06:00:56 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-02-01 05:32:35 -06:00
|
|
|
define gb_ExternalProject__use_harfbuzz
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),harfbuzz)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-04-20 06:00:56 -05:00
|
|
|
endif # SYSTEM_HARFBUZZ
|
2011-04-18 06:13:57 -05:00
|
|
|
|
2021-04-23 03:04:29 -05:00
|
|
|
ifneq ($(ENABLE_OPENSSL),TRUE)
|
2013-04-11 02:24:25 -05:00
|
|
|
|
|
|
|
gb_ExternalProject__use_openssl:=
|
|
|
|
gb_LinkTarget__use_openssl_headers:=
|
|
|
|
gb_LinkTarget__use_openssl:=
|
|
|
|
|
2021-04-23 03:04:29 -05:00
|
|
|
else # ENABLE_OPENSSL
|
2013-04-11 02:24:25 -05:00
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_OPENSSL),)
|
2011-04-18 06:13:57 -05:00
|
|
|
|
2012-12-28 10:19:06 -06:00
|
|
|
gb_LinkTarget__use_openssl_headers:=
|
|
|
|
gb_ExternalProject__use_openssl:=
|
|
|
|
|
2011-04-18 06:13:57 -05:00
|
|
|
define gb_LinkTarget__use_openssl
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(OPENSSL_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-18 06:13:57 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_OPENSSL
|
|
|
|
|
2014-03-13 13:36:48 -05:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
|
|
|
|
openssl \
|
|
|
|
))
|
|
|
|
|
2012-12-28 10:19:06 -06:00
|
|
|
define gb_ExternalProject__use_openssl
|
|
|
|
$(call gb_ExternalProject_use_package,$(1),openssl)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_openssl_headers
|
2021-01-07 03:15:51 -06:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),openssl,full)
|
2012-12-28 10:19:06 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/openssl/include \
|
2012-12-28 10:19:06 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2011-04-18 06:13:57 -05:00
|
|
|
define gb_LinkTarget__use_openssl
|
2012-12-28 10:19:06 -06:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),openssl)
|
2011-04-18 06:13:57 -05:00
|
|
|
ifeq ($(OS),WNT)
|
2013-10-23 17:22:20 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/openssl/libcrypto.lib \
|
|
|
|
$(gb_UnpackedTarball_workdir)/openssl/libssl.lib \
|
2011-04-18 06:13:57 -05:00
|
|
|
)
|
|
|
|
else
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/openssl/libssl.a \
|
|
|
|
$(gb_UnpackedTarball_workdir)/openssl/libcrypto.a \
|
2020-07-14 16:16:53 -05:00
|
|
|
$(if $(filter $(OS),LINUX),-pthread) \
|
2011-04-18 06:13:57 -05:00
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),openssl)
|
2011-04-18 06:13:57 -05:00
|
|
|
ifeq ($(OS),SOLARIS)
|
2012-09-28 05:25:50 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
-lnsl \
|
|
|
|
-lsocket \
|
2011-04-18 06:13:57 -05:00
|
|
|
)
|
|
|
|
endif
|
|
|
|
endif
|
2011-07-25 16:10:33 -05:00
|
|
|
|
2011-04-18 06:13:57 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_OPENSSL
|
2021-04-23 03:04:29 -05:00
|
|
|
endif # ENABLE_OPENSSL
|
2011-04-18 06:13:57 -05:00
|
|
|
|
2011-07-27 18:03:23 -05:00
|
|
|
|
2023-12-18 13:50:05 -06:00
|
|
|
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
|
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_CDR),)
|
2011-11-28 08:06:59 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_cdr
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(CDR_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(CDR_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-02-19 04:22:02 -06:00
|
|
|
else # !SYSTEM_CDR
|
2011-11-28 08:06:59 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_cdr
|
2013-05-24 06:48:03 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libcdr/inc \
|
2013-05-24 06:48:03 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libcdr/src/lib/.libs/libcdr-0.1$(gb_StaticLibrary_PLAINEXT) \
|
2011-11-28 08:06:59 -06:00
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libcdr)
|
2011-11-28 08:06:59 -06:00
|
|
|
endef
|
|
|
|
|
2013-02-19 04:22:02 -06:00
|
|
|
endif # SYSTEM_CDR
|
2011-11-28 08:06:59 -06:00
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_EBOOK),)
|
2013-11-09 08:52:36 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_ebook
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(EBOOK_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(EBOOK_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
gb_ExternalProject__use_ebook :=
|
|
|
|
|
|
|
|
else # !SYSTEM_EBOOK
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_ebook
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2014-05-24 07:21:21 -05:00
|
|
|
-I${WORKDIR}/UnpackedTarball/libebook/inc \
|
2013-11-09 08:52:36 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libebook/src/lib/.libs/libe-book-0.1$(gb_StaticLibrary_PLAINEXT) \
|
2013-11-09 08:52:36 -06:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libebook)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_ebook
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libebook)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_EBOOK
|
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_ETONYEK),)
|
2013-10-24 09:46:49 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_etonyek
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(ETONYEK_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(ETONYEK_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
gb_ExternalProject__use_etonyek :=
|
|
|
|
|
|
|
|
else # !SYSTEM_ETONYEK
|
|
|
|
|
2015-05-19 09:12:08 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
|
|
|
etonyek \
|
|
|
|
))
|
|
|
|
|
2013-10-24 09:46:49 -05:00
|
|
|
define gb_LinkTarget__use_etonyek
|
2015-05-19 09:12:08 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libetonyek/inc \
|
2015-05-19 09:12:08 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
etonyek \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !MSC
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
|
|
|
|
libetonyek \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_etonyek
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),libetonyek)
|
|
|
|
|
2013-10-24 09:46:49 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2014-05-24 07:21:21 -05:00
|
|
|
-I${WORKDIR}/UnpackedTarball/libetonyek/inc \
|
2015-05-19 09:12:08 -05:00
|
|
|
-DLIBETONYEK_VISIBILITY \
|
2013-10-24 09:46:49 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/libetonyek/src/lib/.libs -letonyek-0.1 \
|
2013-10-24 09:46:49 -05:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libetonyek)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_etonyek
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libetonyek)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2015-05-19 09:12:08 -05:00
|
|
|
endif
|
|
|
|
|
2013-10-24 09:46:49 -05:00
|
|
|
endif # SYSTEM_ETONYEK
|
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_FREEHAND),)
|
2013-10-31 06:42:50 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_freehand
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(FREEHAND_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(FREEHAND_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
gb_ExternalProject__use_freehand :=
|
|
|
|
|
|
|
|
else # !SYSTEM_FREEHAND
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_freehand
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2014-05-24 07:21:21 -05:00
|
|
|
-I${WORKDIR}/UnpackedTarball/libfreehand/inc \
|
2013-10-31 06:42:50 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libfreehand/src/lib/.libs/libfreehand-0.1$(gb_StaticLibrary_PLAINEXT) \
|
2013-10-31 06:42:50 -05:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libfreehand)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_freehand
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libfreehand)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_FREEHAND
|
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_ODFGEN),)
|
2013-05-02 13:25:51 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_odfgen
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(ODFGEN_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(ODFGEN_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_ODFGEN
|
|
|
|
|
2014-05-24 02:13:33 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
|
|
|
odfgen \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_odfgen
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libodfgen/inc \
|
2014-05-24 02:13:33 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
odfgen \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !MSC
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
|
|
|
|
libodfgen \
|
|
|
|
))
|
|
|
|
|
2013-05-02 13:25:51 -05:00
|
|
|
define gb_LinkTarget__use_odfgen
|
2014-05-24 02:13:33 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),libodfgen)
|
|
|
|
|
2013-05-24 06:49:11 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libodfgen/inc \
|
2015-01-26 08:09:13 -06:00
|
|
|
-DLIBODFGEN_VISIBILITY \
|
2013-05-24 06:49:11 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/libodfgen/src/.libs -lodfgen-0.1 \
|
2013-05-02 13:25:51 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-05-24 02:13:33 -05:00
|
|
|
endif
|
|
|
|
|
2013-05-02 13:25:51 -05:00
|
|
|
endif # SYSTEM_ODFGEN
|
|
|
|
|
2017-08-02 09:29:48 -05:00
|
|
|
ifneq ($(SYSTEM_EPUBGEN),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_epubgen
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(EPUBGEN_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(EPUBGEN_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
gb_ExternalProject__use_epubgen :=
|
|
|
|
|
|
|
|
else # !SYSTEM_EPUBGEN
|
2021-04-30 10:26:41 -05:00
|
|
|
ifneq ($(ENABLE_WASM_STRIP_EPUB),TRUE)
|
2017-08-02 09:29:48 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_epubgen
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libepubgen/inc \
|
2017-08-02 09:29:48 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libepubgen/src/lib/.libs/libepubgen-0.1$(gb_StaticLibrary_PLAINEXT) \
|
2017-08-02 09:29:48 -05:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libepubgen)
|
|
|
|
|
|
|
|
endef
|
|
|
|
define gb_ExternalProject__use_epubgen
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libepubgen)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2021-04-30 10:26:41 -05:00
|
|
|
endif # ENABLE_WASM_STRIP_EPUB
|
2017-08-02 09:29:48 -05:00
|
|
|
endif # SYSTEM_EPUBGEN
|
2013-05-02 13:25:51 -05:00
|
|
|
|
2014-05-24 01:39:54 -05:00
|
|
|
ifneq ($(SYSTEM_REVENGE),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_revenge
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(REVENGE_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(REVENGE_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-05-25 06:06:57 -05:00
|
|
|
gb_ExternalProject__use_revenge :=
|
|
|
|
|
2014-05-24 01:39:54 -05:00
|
|
|
else # !SYSTEM_REVENGE
|
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
|
|
|
revenge \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_revenge
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2014-05-25 06:19:31 -05:00
|
|
|
$(REVENGE_CFLAGS) \
|
2014-05-24 01:39:54 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
revenge \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-05-25 06:06:57 -05:00
|
|
|
define gb_ExternalProject__use_revenge
|
|
|
|
$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Library_get_target,revenge)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-05-24 01:39:54 -05:00
|
|
|
else # !MSC
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
|
|
|
|
librevenge \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_revenge
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),librevenge)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2014-05-25 06:19:31 -05:00
|
|
|
$(REVENGE_CFLAGS) \
|
2015-01-26 08:09:13 -06:00
|
|
|
-DLIBREVENGE_VISIBILITY \
|
2014-05-24 01:39:54 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2014-05-25 06:19:31 -05:00
|
|
|
$(REVENGE_LIBS) \
|
2014-05-24 01:39:54 -05:00
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
2014-05-25 06:06:57 -05:00
|
|
|
define gb_ExternalProject__use_revenge
|
|
|
|
$(call gb_ExternalProject_use_package,$(1),librevenge)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-05-24 01:39:54 -05:00
|
|
|
endif # MSC
|
|
|
|
|
|
|
|
endif # SYSTEM_REVENGE
|
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_ABW),)
|
2014-01-13 10:01:32 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_abw
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(ABW_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(ABW_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
gb_ExternalProject__use_abw :=
|
|
|
|
|
|
|
|
else # !SYSTEM_ABW
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_abw
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libabw/inc \
|
2014-01-13 10:01:32 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libabw/src/lib/.libs/libabw-0.1$(gb_StaticLibrary_PLAINEXT) \
|
2014-01-13 10:01:32 -06:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libabw)
|
|
|
|
|
|
|
|
endef
|
|
|
|
define gb_ExternalProject__use_abw
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libabw)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_ABW
|
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_MSPUB),)
|
2012-05-24 04:59:16 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_mspub
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(MSPUB_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(MSPUB_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-02-19 04:22:51 -06:00
|
|
|
else # !SYSTEM_MSPUB
|
2012-05-24 04:59:16 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_mspub
|
2013-05-16 06:09:11 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libmspub/inc \
|
2013-05-16 06:09:11 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libmspub/src/lib/.libs/libmspub-0.1$(gb_StaticLibrary_PLAINEXT) \
|
2012-05-24 04:59:16 -05:00
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libmspub)
|
2012-05-24 04:59:16 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-02-19 04:22:51 -06:00
|
|
|
endif # SYSTEM_MSPUB
|
2012-05-24 04:59:16 -05:00
|
|
|
|
|
|
|
|
2014-06-26 14:26:11 -05:00
|
|
|
ifneq ($(SYSTEM_PAGEMAKER),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_pagemaker
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(PAGEMAKER_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(PAGEMAKER_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
gb_ExternalProject__use_pagemaker :=
|
|
|
|
|
|
|
|
else # !SYSTEM_PAGEMAKER
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_pagemaker
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libpagemaker/inc \
|
2014-06-26 14:26:11 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libpagemaker/src/lib/.libs/libpagemaker-0.0$(gb_StaticLibrary_PLAINEXT) \
|
2014-06-26 14:26:11 -05:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libpagemaker)
|
|
|
|
|
|
|
|
endef
|
|
|
|
define gb_ExternalProject__use_pagemaker
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libpagemaker)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_PAGEMAKER
|
|
|
|
|
|
|
|
|
2017-08-27 14:10:14 -05:00
|
|
|
ifneq ($(SYSTEM_QXP),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_qxp
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(QXP_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(QXP_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
gb_ExternalProject__use_qxp :=
|
|
|
|
|
|
|
|
else # !SYSTEM_QXP
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_qxp
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libqxp/inc \
|
2017-08-27 14:10:14 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libqxp/src/lib/.libs/libqxp-0.0$(gb_StaticLibrary_PLAINEXT) \
|
2017-08-27 14:10:14 -05:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libqxp)
|
|
|
|
|
|
|
|
endef
|
|
|
|
define gb_ExternalProject__use_qxp
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libqxp)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_QXP
|
|
|
|
|
|
|
|
|
2016-06-22 11:02:29 -05:00
|
|
|
ifneq ($(SYSTEM_ZMF),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_zmf
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(ZMF_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(ZMF_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
gb_ExternalProject__use_zmf :=
|
|
|
|
|
|
|
|
else # !SYSTEM_ZMF
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_zmf
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libzmf/inc \
|
2016-06-22 11:02:29 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libzmf/src/lib/.libs/libzmf-0.0$(gb_StaticLibrary_PLAINEXT) \
|
2016-06-22 11:02:29 -05:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libzmf)
|
|
|
|
|
|
|
|
endef
|
|
|
|
define gb_ExternalProject__use_zmf
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libzmf)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_ZMF
|
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_VISIO),)
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_visio
|
2011-08-02 00:10:30 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2011-10-05 03:21:08 -05:00
|
|
|
$(VISIO_CFLAGS) \
|
2011-08-02 00:10:30 -05:00
|
|
|
)
|
2011-10-05 03:21:08 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(VISIO_LIBS))
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-02-19 04:14:46 -06:00
|
|
|
else # !SYSTEM_VISIO
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_visio
|
2013-05-16 06:14:37 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libvisio/inc \
|
2013-05-16 06:14:37 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libvisio/src/lib/.libs/libvisio-0.1$(gb_StaticLibrary_PLAINEXT) \
|
2011-07-28 10:29:44 -05:00
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libvisio)
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-02-19 04:14:46 -06:00
|
|
|
endif # SYSTEM_VISIO
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_WPD),)
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_wpd
|
2011-08-02 00:10:30 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2011-10-05 03:04:04 -05:00
|
|
|
$(WPD_CFLAGS) \
|
2011-08-02 00:10:30 -05:00
|
|
|
)
|
2011-10-05 03:04:04 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(WPD_LIBS))
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
endef
|
2012-10-05 14:17:25 -05:00
|
|
|
gb_ExternalProject__use_wpd :=
|
2011-07-28 10:29:44 -05:00
|
|
|
|
2013-02-19 04:20:31 -06:00
|
|
|
else # !SYSTEM_WPD
|
2011-07-28 10:29:44 -05:00
|
|
|
|
2014-12-23 11:37:54 -06:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
|
|
|
wpd \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_wpd
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(WPD_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
wpd \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_wpd
|
|
|
|
$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Library_get_target,wpd)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !MSC
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
|
|
|
|
libwpd \
|
|
|
|
))
|
|
|
|
|
2012-09-24 06:17:45 -05:00
|
|
|
define gb_LinkTarget__use_wpd
|
2014-12-23 11:37:54 -06:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),libwpd)
|
|
|
|
|
2013-05-16 06:28:14 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(WPD_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2014-12-23 11:37:54 -06:00
|
|
|
$(WPD_LIBS) \
|
2012-09-24 06:17:45 -05:00
|
|
|
)
|
|
|
|
|
2012-10-05 14:17:25 -05:00
|
|
|
endef
|
2014-12-23 11:37:54 -06:00
|
|
|
|
2012-10-05 14:17:25 -05:00
|
|
|
define gb_ExternalProject__use_wpd
|
2014-12-23 11:37:54 -06:00
|
|
|
$(call gb_ExternalProject_use_package,$(1),libwpd)
|
2012-10-05 14:17:25 -05:00
|
|
|
|
2012-09-24 06:17:45 -05:00
|
|
|
endef
|
|
|
|
|
2014-12-23 11:37:54 -06:00
|
|
|
endif # MSC
|
|
|
|
|
2013-02-19 04:20:31 -06:00
|
|
|
endif # SYSTEM_WPD
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_WPG),)
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_wpg
|
2011-08-02 00:10:30 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2011-10-05 03:15:40 -05:00
|
|
|
$(WPG_CFLAGS) \
|
2011-08-02 00:10:30 -05:00
|
|
|
)
|
2011-10-05 03:15:40 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(WPG_LIBS))
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
endef
|
2012-10-05 14:17:25 -05:00
|
|
|
gb_ExternalProject__use_wpg :=
|
2011-07-28 10:29:44 -05:00
|
|
|
|
2013-02-19 04:26:46 -06:00
|
|
|
else # !SYSTEM_WPG
|
2011-07-28 10:29:44 -05:00
|
|
|
|
2014-12-23 11:37:54 -06:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
|
|
|
wpg \
|
|
|
|
))
|
|
|
|
|
2011-07-28 10:29:44 -05:00
|
|
|
define gb_LinkTarget__use_wpg
|
2013-05-24 07:53:37 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libwpg/inc \
|
2013-05-24 07:53:37 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2014-12-23 11:37:54 -06:00
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
wpg \
|
2011-07-28 10:29:44 -05:00
|
|
|
)
|
|
|
|
|
2012-10-05 14:17:25 -05:00
|
|
|
endef
|
2014-12-23 11:37:54 -06:00
|
|
|
|
|
|
|
else # !MSC
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
|
|
|
|
libwpg \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_wpg
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),libwpg)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libwpg/inc \
|
2014-12-23 11:37:54 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/libwpg/src/lib/.libs -lwpg-0.3 \
|
2014-12-23 11:37:54 -06:00
|
|
|
)
|
2012-10-05 14:17:25 -05:00
|
|
|
|
2011-07-28 10:29:44 -05:00
|
|
|
endef
|
|
|
|
|
2014-12-23 11:37:54 -06:00
|
|
|
endif # MSC
|
|
|
|
|
2013-02-19 04:26:46 -06:00
|
|
|
endif # SYSTEM_WPG
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_WPS),)
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_wps
|
2011-08-02 00:10:30 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2011-10-05 03:18:53 -05:00
|
|
|
$(WPS_CFLAGS) \
|
2011-08-02 00:10:30 -05:00
|
|
|
)
|
2011-10-05 03:18:53 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(WPS_LIBS))
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
endef
|
2012-10-05 14:17:25 -05:00
|
|
|
gb_ExternalProject__use_wps :=
|
2011-07-28 10:29:44 -05:00
|
|
|
|
2013-02-19 04:26:46 -06:00
|
|
|
else # !SYSTEM_WPS
|
2011-07-28 10:29:44 -05:00
|
|
|
|
2014-05-30 08:35:48 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
|
|
|
wps \
|
|
|
|
))
|
|
|
|
|
2011-07-28 10:29:44 -05:00
|
|
|
define gb_LinkTarget__use_wps
|
2013-05-24 07:58:31 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libwps/inc \
|
2013-05-24 07:58:31 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2014-05-30 08:35:48 -05:00
|
|
|
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
wps \
|
2011-07-28 10:29:44 -05:00
|
|
|
)
|
|
|
|
|
2012-10-05 14:17:25 -05:00
|
|
|
endef
|
2014-05-30 08:35:48 -05:00
|
|
|
|
|
|
|
else # !MSC
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
|
|
|
|
libwps \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_wps
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),libwps)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libwps/inc \
|
2014-05-30 08:35:48 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/libwps/src/lib/.libs -lwps-0.4 \
|
2014-05-30 08:35:48 -05:00
|
|
|
)
|
2012-10-05 14:17:25 -05:00
|
|
|
|
2011-07-28 10:29:44 -05:00
|
|
|
endef
|
|
|
|
|
2014-05-30 08:35:48 -05:00
|
|
|
endif # MSC
|
|
|
|
|
2013-02-19 04:26:46 -06:00
|
|
|
endif # SYSTEM_WPS
|
2011-07-28 10:29:44 -05:00
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_MWAW),)
|
2013-03-11 06:38:12 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_mwaw
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(MWAW_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(MWAW_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_MWAW
|
|
|
|
|
2014-05-30 06:55:20 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
|
|
|
mwaw \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_mwaw
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libmwaw/inc \
|
2014-05-30 06:55:20 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
mwaw \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !MSC
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
|
|
|
libmwaw \
|
|
|
|
))
|
|
|
|
|
2013-03-11 06:38:12 -05:00
|
|
|
define gb_LinkTarget__use_mwaw
|
2014-05-30 06:55:20 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),libmwaw)
|
|
|
|
|
2013-05-16 06:11:36 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libmwaw/inc \
|
2013-05-16 06:11:36 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/libmwaw/src/lib/.libs -lmwaw-0.3 \
|
2013-03-11 06:38:12 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-05-30 06:55:20 -05:00
|
|
|
endif # MSC
|
|
|
|
|
2013-03-11 06:38:12 -05:00
|
|
|
endif # SYSTEM_MWAW
|
|
|
|
|
2016-08-10 05:43:56 -05:00
|
|
|
ifneq ($(SYSTEM_STAROFFICE),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_staroffice
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(STAROFFICE_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(STAROFFICE_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_STAROFFICE
|
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
|
|
|
staroffice \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_staroffice
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libstaroffice/inc \
|
2016-08-10 05:43:56 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
staroffice \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !MSC
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
|
|
|
libstaroffice \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_staroffice
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),libstaroffice)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libstaroffice/inc \
|
2016-08-10 05:43:56 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/libstaroffice/src/lib/.libs -lstaroffice-0.0 \
|
2016-08-10 05:43:56 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # MSC
|
|
|
|
|
|
|
|
endif # SYSTEM_STAROFFICE
|
|
|
|
|
2013-03-11 06:38:12 -05:00
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_LCMS2),)
|
2012-03-02 03:15:42 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_lcms2
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2012-11-04 07:46:44 -06:00
|
|
|
$(LCMS2_CFLAGS) \
|
2012-03-02 03:15:42 -06:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-11-08 20:00:30 -06:00
|
|
|
gb_ExternalProject__use_lcms2 :=
|
|
|
|
|
2012-03-02 03:15:42 -06:00
|
|
|
else # !SYSTEM_LCMS2
|
|
|
|
|
2014-02-17 04:23:19 -06:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
|
|
|
lcms2 \
|
|
|
|
))
|
|
|
|
|
2012-11-08 20:00:30 -06:00
|
|
|
define gb_ExternalProject__use_lcms2
|
|
|
|
$(call gb_ExternalProject_use_package,$(1),lcms2)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-06-06 14:57:56 -05:00
|
|
|
ifeq ($(OS),ANDROID)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_lcms2
|
2012-11-13 12:44:44 -06:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),lcms2)
|
2012-09-04 15:00:15 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/lcms2/include \
|
2012-09-04 15:00:15 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2012-06-06 14:57:56 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else
|
|
|
|
|
2012-03-02 03:15:42 -06:00
|
|
|
define gb_LinkTarget__use_lcms2
|
2012-11-13 12:44:44 -06:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),lcms2)
|
2012-09-04 15:00:15 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/lcms2/include \
|
2012-09-04 15:00:15 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-10-23 15:04:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
|
2012-03-02 03:15:42 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-06-06 14:57:56 -05:00
|
|
|
endif # ANDROID
|
2012-03-02 03:15:42 -06:00
|
|
|
endif # SYSTEM_LCMS2
|
|
|
|
|
2014-03-31 12:36:41 -05:00
|
|
|
ifneq ($(ENABLE_LPSOLVE),)
|
2012-03-02 03:15:42 -06:00
|
|
|
|
2014-02-11 12:25:30 -06:00
|
|
|
ifneq ($(SYSTEM_LPSOLVE),)
|
2011-07-27 18:03:23 -05:00
|
|
|
|
2012-11-03 18:19:30 -05:00
|
|
|
define gb_LinkTarget__use_lpsolve
|
2011-07-27 18:03:23 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
|
2012-11-03 18:19:30 -05:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DSYSTEM_LPSOLVE \
|
2012-11-07 17:18:08 -06:00
|
|
|
)
|
2011-07-27 18:03:23 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_LPSOLVE
|
|
|
|
|
2012-11-03 18:19:30 -05:00
|
|
|
define gb_LinkTarget__use_lpsolve
|
2019-10-19 08:50:07 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),lpsolve)
|
2013-10-23 18:25:59 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/lpsolve/lpsolve55/lpsolve55.lib \
|
2013-10-23 18:25:59 -05:00
|
|
|
)
|
|
|
|
else
|
2013-10-23 14:33:51 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/lpsolve/lpsolve55 -llpsolve55 \
|
2011-07-27 18:03:23 -05:00
|
|
|
)
|
2013-10-23 18:25:59 -05:00
|
|
|
endif
|
2012-11-03 18:19:30 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/lpsolve \
|
2012-11-03 18:19:30 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2011-07-27 18:03:23 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-02-27 10:08:09 -06:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
|
|
|
lpsolve \
|
|
|
|
))
|
|
|
|
|
2011-07-27 18:03:23 -05:00
|
|
|
endif # SYSTEM_LPSOLVE
|
2014-02-28 03:39:19 -06:00
|
|
|
|
2014-03-27 08:51:46 -05:00
|
|
|
else
|
|
|
|
|
|
|
|
gb_LinkTarget__use_lpsolve :=
|
|
|
|
|
2014-03-31 12:36:41 -05:00
|
|
|
endif # ENABLE_LPSOLVE
|
|
|
|
|
|
|
|
ifneq ($(ENABLE_COINMP),)
|
2014-02-28 03:39:19 -06:00
|
|
|
|
2014-08-05 17:03:21 -05:00
|
|
|
ifneq ($(SYSTEM_COINMP),TRUE)
|
|
|
|
|
2014-02-28 03:39:19 -06:00
|
|
|
define gb_LinkTarget__use_coinmp
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),coinmp)
|
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/coinmp/CoinMP/MSVisualStudio/v9/$(wnt_arch_subdir_optional)$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
|
2014-02-28 03:39:19 -06:00
|
|
|
)
|
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/coinmp/Cbc/src/.libs -lCbc -lCbcSolver \
|
|
|
|
-L$(gb_UnpackedTarball_workdir)/coinmp/Cgl/src/.libs -lCgl \
|
|
|
|
-L$(gb_UnpackedTarball_workdir)/coinmp/Clp/src/.libs -lClp \
|
|
|
|
-L$(gb_UnpackedTarball_workdir)/coinmp/Clp/src/OsiClp/.libs -lOsiClp \
|
|
|
|
-L$(gb_UnpackedTarball_workdir)/coinmp/CoinMP/src/.libs -lCoinMP \
|
|
|
|
-L$(gb_UnpackedTarball_workdir)/coinmp/CoinUtils/src/.libs -lCoinUtils \
|
|
|
|
-L$(gb_UnpackedTarball_workdir)/coinmp/Osi/src/Osi/.libs -lOsi \
|
2014-02-28 03:39:19 -06:00
|
|
|
)
|
|
|
|
endif
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/coinmp/CoinMP/src \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/coinmp/CoinUtils/src \
|
2014-02-28 03:39:19 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
|
|
|
coinmp \
|
|
|
|
))
|
|
|
|
|
2014-08-05 17:03:21 -05:00
|
|
|
else # SYSTEM_COINMP
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_coinmp
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(COINMP_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(COINMP_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
2014-03-27 08:51:46 -05:00
|
|
|
else
|
|
|
|
|
|
|
|
gb_LinkTarget__use_coinmp :=
|
|
|
|
|
2014-03-31 12:36:41 -05:00
|
|
|
endif # ENABLE_COINMP
|
2011-07-27 18:03:23 -05:00
|
|
|
|
2015-11-27 16:54:40 -06:00
|
|
|
ifneq (,$(filter MDNSRESPONDER,$(BUILD_TYPE)))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_mDNSResponder
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/mDNSResponder/mDNSShared \
|
2015-11-27 16:54:40 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),mDNSResponder)
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # MDNSRESPONDER
|
|
|
|
|
2012-08-30 07:58:15 -05:00
|
|
|
ifeq ($(ENABLE_GIO),TRUE)
|
2011-07-27 18:03:23 -05:00
|
|
|
|
2012-01-14 19:12:49 -06:00
|
|
|
define gb_LinkTarget__use_gio
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2012-01-16 02:57:38 -06:00
|
|
|
$(GIO_CFLAGS) \
|
2012-01-14 19:12:49 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(GIO_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-08-30 07:58:15 -05:00
|
|
|
else # ENABLE_GIO
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_gio
|
2012-11-06 14:09:57 -06:00
|
|
|
|
2012-08-30 07:58:15 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
endif # ENABLE_GIO
|
|
|
|
|
2013-07-24 04:16:31 -05:00
|
|
|
ifeq ($(ENABLE_AVAHI),TRUE)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_avahi
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(AVAHI_CFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DENABLE_AVAHI \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(AVAHI_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # ENABLE_AVAHI
|
|
|
|
|
2013-11-05 00:03:08 -06:00
|
|
|
gb_LinkTarget__use_avahi :=
|
2013-07-24 04:16:31 -05:00
|
|
|
|
|
|
|
endif # ENABLE_AVAHI
|
|
|
|
|
Handle CPDB lib in configure/build system
In preparation of Biswadeep's upcoming GSoC changes (see [1])
to update the CPDB (Common Print Dialog Backends) support to the
latest version and use the CPDB C API, add a
corresponding `--enable-cpdb` autogen option
(disabled by default).
When CPDB is enabled, check for the cpdb-frontend
library, define `ENABLE_CPDB` and set the compiler
and linker flags for building the `CPDManager`
(in vcl/unx/generic/printer/cpdmgr.cxx).
Add checks for existing code using `CPDBManager`,
so it only gets used when when CPDB is actually enabled.
While the cpdb-frontend library is currently not
actually used in `CPDManager` yet (as the previous approach
tried to use some DBUs API directly), it will be in
Biswadeep's upcoming changes.
With this commit in place, an `--enable-cpdb` build
works with this additional local test change in place
to actually make use of the library:
diff --git a/vcl/unx/generic/printer/cpdmgr.cxx b/vcl/unx/generic/printer/cpdmgr.cxx
index 7dc17cede353..0c3b71d519db 100644
--- a/vcl/unx/generic/printer/cpdmgr.cxx
+++ b/vcl/unx/generic/printer/cpdmgr.cxx
@@ -22,6 +22,8 @@
#include <cstddef>
#include <unistd.h>
+#include <cpdb/cpdb-frontend.h>
+
#include <unx/cpdmgr.hxx>
#include <osl/file.h>
@@ -259,6 +261,7 @@ CPDManager* CPDManager::tryLoadCPD()
}
}
#endif
+ cpdbPrintFile(nullptr, nullptr);
return pManager;
}
[1] https://lists.freedesktop.org/archives/libreoffice/2024-May/091911.html
Change-Id: Ifc50d2cd6496346bea55c73cb703e3c2d3eb44b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168656
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Biswadeep Purkayastha <bpdps95@hotmail.com>
2024-06-11 00:31:07 -05:00
|
|
|
ifeq ($(ENABLE_CPDB),TRUE)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_cpdb
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(CPDB_CFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(CPDB_LIBS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # ENABLE_CPDB
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_cpdb
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # ENABLE_CPDB
|
|
|
|
|
2012-09-14 05:31:50 -05:00
|
|
|
ifeq ($(ENABLE_CUPS),TRUE)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_cups
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
-lcups \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # ENABLE_CUPS
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_cups
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2018-07-08 08:33:32 -05:00
|
|
|
endif # ENABLE_CUPS
|
2011-11-02 07:00:48 -05:00
|
|
|
|
2012-08-30 07:44:53 -05:00
|
|
|
ifeq ($(ENABLE_DBUS),TRUE)
|
2011-11-02 07:00:48 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_dbus
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(DBUS_CFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(DBUS_LIBS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # ENABLE_DBUS
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_dbus
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # ENABLE_DBUS
|
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_LIBPNG),)
|
2011-09-15 07:44:34 -05:00
|
|
|
|
2017-09-14 07:12:40 -05:00
|
|
|
define gb_LinkTarget__use_libpng
|
2011-09-15 07:44:34 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(LIBPNG_CFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(LIBPNG_LIBS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-09-14 07:12:40 -05:00
|
|
|
gb_ExternalProject__use_libpng :=
|
2016-11-03 07:58:29 -05:00
|
|
|
|
2011-09-15 07:44:34 -05:00
|
|
|
else # !SYSTEM_LIBPNG
|
|
|
|
|
2017-09-14 07:12:40 -05:00
|
|
|
define gb_LinkTarget__use_libpng
|
2013-05-08 10:22:22 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(LIBPNG_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2012-09-08 11:13:20 -05:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
2017-09-14 07:12:40 -05:00
|
|
|
libpng \
|
2011-09-15 07:44:34 -05:00
|
|
|
)
|
2012-09-28 14:47:29 -05:00
|
|
|
$(call gb_LinkTarget__use_zlib,$(1))
|
2011-09-15 07:44:34 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-09-14 07:12:40 -05:00
|
|
|
define gb_ExternalProject__use_libpng
|
2016-11-03 07:58:29 -05:00
|
|
|
$(call gb_ExternalProject_use_static_libraries,$(1),\
|
2017-09-14 07:12:40 -05:00
|
|
|
libpng \
|
2016-11-03 07:58:29 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2011-09-15 07:44:34 -05:00
|
|
|
endif # !SYSTEM_LIBPNG
|
|
|
|
|
2022-05-19 14:09:51 -05:00
|
|
|
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),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libtiff/libtiff \
|
2022-05-19 14:09:51 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libtiff/libtiff/.libs/libtiff$(gb_StaticLibrary_PLAINEXT) \
|
2022-05-19 14:09:51 -05:00
|
|
|
)
|
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/libtiff/libtiff/.libs -ltiff \
|
2022-05-19 14:09:51 -05:00
|
|
|
)
|
|
|
|
endif
|
2022-05-24 02:18:38 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libtiff,full)
|
2022-05-19 14:09:51 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_libtiff
|
2022-05-21 10:30:59 -05:00
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libtiff)
|
2022-05-19 14:09:51 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # !SYSTEM_LIBTIFF
|
2011-12-06 12:17:52 -06:00
|
|
|
|
2022-01-13 08:59:49 -06:00
|
|
|
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),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libwebp/src \
|
2022-01-13 08:59:49 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libwebp/output/lib/libwebp$(if $(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT) \
|
2022-01-13 08:59:49 -06:00
|
|
|
)
|
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/libwebp/src/.libs -lwebp \
|
|
|
|
-L$(gb_UnpackedTarball_workdir)/libwebp/sharpyuv/.libs -lsharpyuv \
|
2022-01-13 08:59:49 -06:00
|
|
|
)
|
|
|
|
endif
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libwebp)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_libwebp
|
2022-05-21 10:30:59 -05:00
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libwebp)
|
2022-01-13 08:59:49 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # !SYSTEM_LIBWEBP
|
|
|
|
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_CURL),)
|
2011-12-06 12:17:52 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_curl
|
2014-07-16 10:02:01 -05:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DSYSTEM_CURL \
|
|
|
|
)
|
2011-12-06 12:17:52 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(CURL_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(CURL_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_CURL
|
|
|
|
|
2023-11-10 12:09:11 -06:00
|
|
|
$(if $(ENABLE_CURL),\
|
2014-02-17 04:23:19 -06:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
|
|
|
curl \
|
2023-11-10 12:09:11 -06:00
|
|
|
)))
|
2014-02-17 04:23:19 -06:00
|
|
|
|
2011-12-06 12:17:52 -06:00
|
|
|
define gb_LinkTarget__use_curl
|
2012-11-13 12:44:44 -06:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),curl)
|
2012-10-29 16:57:34 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/curl/include \
|
2012-10-29 16:57:34 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-10-23 15:37:11 -05:00
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
2013-10-23 17:32:04 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/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 \
|
2011-12-06 12:17:52 -06:00
|
|
|
)
|
2013-10-23 15:37:11 -05:00
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/curl/lib/.libs -lcurl \
|
2013-10-23 15:37:11 -05:00
|
|
|
)
|
|
|
|
endif
|
2011-12-06 12:17:52 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_CURL
|
|
|
|
|
2012-11-27 08:35:02 -06:00
|
|
|
ifeq ($(ENABLE_VALGRIND),TRUE)
|
2011-12-23 05:21:19 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_valgrind
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
2012-11-27 08:35:02 -06:00
|
|
|
-DHAVE_VALGRIND_HEADERS \
|
2011-12-23 05:21:19 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(VALGRIND_CFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-11-27 08:35:02 -06:00
|
|
|
else # !ENABLE_VALGRIND
|
2011-12-23 05:21:19 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_valgrind
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-11-27 08:35:02 -06:00
|
|
|
endif # ENABLE_VALGRIND
|
2011-12-23 05:21:19 -06:00
|
|
|
|
2019-03-06 21:06:35 -06:00
|
|
|
ifeq ($(ENABLE_POPPLER),TRUE)
|
|
|
|
|
2014-02-11 12:35:22 -06:00
|
|
|
ifneq ($(SYSTEM_POPPLER),)
|
2012-02-18 11:54:35 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_poppler
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(POPPLER_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(POPPLER_LIBS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_POPPLER
|
|
|
|
|
2021-11-12 07:13:16 -06:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,pdfimport,\
|
|
|
|
poppler_data \
|
|
|
|
))
|
|
|
|
|
2012-02-18 11:54:35 -06:00
|
|
|
define gb_LinkTarget__use_poppler
|
2015-09-29 11:09:16 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),poppler,full)
|
2021-05-11 08:22:27 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),poppler_data)
|
2012-02-20 23:58:02 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/poppler \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/poppler/poppler \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/poppler/goo \
|
2012-02-20 23:58:02 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
2018-06-20 09:10:44 -05:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),poppler)
|
2017-09-13 15:50:14 -05:00
|
|
|
$(call gb_LinkTarget_use_external,$(1),libjpeg)
|
2016-11-03 09:58:08 -05:00
|
|
|
|
2012-02-20 23:58:02 -06:00
|
|
|
ifeq ($(OS),MACOSX)
|
2012-09-27 17:54:49 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
-lobjc \
|
2012-02-18 11:54:35 -06:00
|
|
|
)
|
2014-08-30 09:12:53 -05:00
|
|
|
else ifeq ($(OS),LINUX)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
-pthread \
|
|
|
|
)
|
2012-02-20 23:58:02 -06:00
|
|
|
else ifeq ($(OS),WNT)
|
2012-09-28 08:31:46 -05:00
|
|
|
$(call gb_LinkTarget_use_system_win32_libs,$(1),\
|
2012-02-20 23:58:02 -06:00
|
|
|
advapi32 \
|
|
|
|
gdi32 \
|
|
|
|
)
|
|
|
|
endif
|
2012-02-18 11:54:35 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_POPPLER
|
|
|
|
|
2019-03-06 21:06:35 -06:00
|
|
|
endif # ENABLE_POPPLER
|
|
|
|
|
2011-12-23 05:21:19 -06:00
|
|
|
|
2014-02-11 09:33:18 -06:00
|
|
|
ifneq ($(SYSTEM_CLUCENE),)
|
2012-04-07 08:50:47 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_clucene
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
2014-08-07 12:40:33 -05:00
|
|
|
$(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(CLUCENE_CFLAGS))) \
|
2023-11-02 12:17:50 -05:00
|
|
|
-DSYSTEM_CLUCENE \
|
2012-04-07 08:50:47 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2014-08-07 12:40:33 -05:00
|
|
|
$(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(CLUCENE_CFLAGS)))) \
|
2012-04-07 08:50:47 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(CLUCENE_LIBS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_CLUCENE
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_clucene
|
2013-05-07 16:47:27 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/clucene/src/core \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/clucene/src/shared \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/clucene/src/contribs-lib \
|
2013-05-07 16:47:27 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
2012-04-07 16:22:08 -05:00
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
2012-04-07 08:50:47 -05:00
|
|
|
clucene \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-02-12 02:53:02 -06:00
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
2021-12-21 07:12:10 -06:00
|
|
|
$(call gb_Helper_optionals_or,HELPTOOLS XMLHELP,clucene) \
|
2012-04-07 08:50:47 -05:00
|
|
|
))
|
|
|
|
|
|
|
|
endif # SYSTEM_CLUCENE
|
|
|
|
|
2011-12-22 15:34:35 -06:00
|
|
|
define gb_LinkTarget__use_gobject
|
2012-11-06 13:38:47 -06:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(GOBJECT_LIBS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(GOBJECT_CFLAGS) \
|
|
|
|
)
|
2011-12-22 15:34:35 -06:00
|
|
|
endef
|
|
|
|
|
2018-04-11 09:39:57 -05:00
|
|
|
ifneq ($(SYSTEM_HSQLDB),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_hsqldb
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
|
|
-DSYSTEM_HSQLDB \
|
|
|
|
-DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\" \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_HSQLDB
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_hsqldb
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_HSQLDB
|
|
|
|
|
2019-01-08 03:53:51 -06:00
|
|
|
ifeq ($(ENABLE_LDAP),TRUE)
|
2014-02-11 12:11:47 -06:00
|
|
|
ifneq ($(SYSTEM_OPENLDAP),)
|
2012-07-16 12:00:07 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_openldap
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
-lldap \
|
|
|
|
-llber \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-09-19 12:28:36 -05:00
|
|
|
gb_ExternalProject__use_openldap :=
|
|
|
|
|
2014-02-11 12:11:47 -06:00
|
|
|
else # !SYSTEM_OPENLDAP
|
2012-07-16 12:00:07 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_openldap
|
2012-10-29 17:29:37 -05:00
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),openldap)
|
2012-07-16 12:00:07 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/openldap/include \
|
2012-07-16 12:00:07 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2015-10-09 02:21:48 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),openldap,full)
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1), \
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/openldap/libraries/libldap/.libs/libldap.a \
|
|
|
|
$(gb_UnpackedTarball_workdir)/openldap/libraries/liblber/.libs/liblber.a \
|
2012-07-16 12:00:07 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
2019-01-08 03:53:51 -06:00
|
|
|
endif
|
2012-07-16 12:00:07 -05:00
|
|
|
|
2013-09-19 12:28:36 -05:00
|
|
|
define gb_ExternalProject__use_openldap
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),openldap)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-07-16 12:00:07 -05:00
|
|
|
endif # SYSTEM_OPENLDAP
|
|
|
|
|
2016-07-28 10:16:19 -05:00
|
|
|
ifneq ($(SYSTEM_LIBTOMMATH),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_libtommath
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(LIBTOMMATH_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBTOMMATH_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_LIBTOMMATH
|
|
|
|
define gb_LinkTarget__use_libtommath
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
-I${WORKDIR}/UnpackedTarball/libtommath \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libtommath/libtommath$(gb_StaticLibrary_PLAINEXT) \
|
2016-07-28 10:16:19 -05:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libtommath)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_LIBTOMMATH
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_libtommath
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libtommath)
|
|
|
|
|
|
|
|
endef
|
2012-07-16 12:00:07 -05:00
|
|
|
|
2013-05-10 13:21:30 -05:00
|
|
|
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
|
|
|
|
|
2014-02-11 12:04:20 -06:00
|
|
|
ifneq ($(SYSTEM_FIREBIRD),)
|
2013-06-14 08:55:22 -05:00
|
|
|
|
2013-07-16 14:50:14 -05:00
|
|
|
define gb_LinkTarget__use_libfbembed
|
2013-05-10 13:21:30 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(FIREBIRD_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(FIREBIRD_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_FIREBIRD
|
|
|
|
|
2017-01-09 07:45:11 -06:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,firebirdsdbc,\
|
|
|
|
firebird \
|
|
|
|
))
|
|
|
|
|
2013-06-14 08:55:22 -05:00
|
|
|
#$(call gb_LinkTarget__use_libatomic_ops,$(1))
|
2016-07-28 10:16:19 -05:00
|
|
|
#$(call gb_LinkTarget__use_libtommath,$(1))
|
2013-06-14 08:55:22 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_libfbembed
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),firebird)
|
2013-05-10 13:21:30 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/firebird/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/include \
|
2013-05-10 13:21:30 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2013-10-22 15:22:49 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/firebird/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/bin/ifbclient.lib \
|
2013-05-10 13:21:30 -05:00
|
|
|
)
|
2013-10-22 15:22:49 -05:00
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/firebird/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib -lfbclient \
|
2013-10-22 15:22:49 -05:00
|
|
|
)
|
|
|
|
endif
|
2013-05-10 13:21:30 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
|
|
# endef
|
|
|
|
|
|
|
|
endif # SYSTEM_FIREBIRD
|
|
|
|
|
|
|
|
else # !ENABLE_FIREBIRD_SDBC
|
2014-02-12 10:01:35 -06:00
|
|
|
|
2013-05-10 13:21:30 -05:00
|
|
|
gb_LinkTarget__use_firebird :=
|
|
|
|
# gb_LinkTarget__use_atomic_ops :=
|
2016-07-28 10:16:19 -05:00
|
|
|
# gb_LinkTarget__use_libtommath :=
|
2013-05-10 13:21:30 -05:00
|
|
|
|
|
|
|
endif # ENABLE_FIREBIRD_SDBC
|
|
|
|
|
|
|
|
|
2014-02-11 11:56:33 -06:00
|
|
|
ifneq ($(SYSTEM_POSTGRESQL),)
|
2012-04-05 03:53:08 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_postgresql
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(POSTGRESQL_INC) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
-lpq \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_ldflags,$(1),\
|
|
|
|
$(POSTGRESQL_LIB) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_POSTGRESQL
|
|
|
|
|
2021-01-21 07:26:01 -06:00
|
|
|
ifeq ($(OS),WNT)
|
2023-11-10 12:10:11 -06:00
|
|
|
$(if $(MPL_SUBSET),,\
|
2021-01-21 07:26:01 -06:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
|
|
|
|
postgresql \
|
2023-11-10 12:10:11 -06:00
|
|
|
)))
|
2021-01-21 07:26:01 -06:00
|
|
|
endif # WNT
|
|
|
|
|
2012-04-05 03:53:08 -05:00
|
|
|
define gb_LinkTarget__use_postgresql
|
|
|
|
|
2021-01-19 08:38:05 -06:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),postgresql,full)
|
2012-10-21 23:33:00 -05:00
|
|
|
|
2012-04-05 03:53:08 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/postgresql/src/include \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/postgresql/src/interfaces/libpq \
|
2012-04-05 03:53:08 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
2021-01-19 08:38:05 -06:00
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/postgresql/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \
|
2012-04-05 03:53:08 -05:00
|
|
|
)
|
|
|
|
|
2021-05-22 14:42:26 -05:00
|
|
|
else # !WNT
|
2012-05-26 17:21:12 -05:00
|
|
|
|
2021-01-19 08:38:05 -06:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/postgresql/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
|
|
|
|
$(gb_UnpackedTarball_workdir)/postgresql/src/common/libpgcommon$(gb_StaticLibrary_PLAINEXT) \
|
|
|
|
$(gb_UnpackedTarball_workdir)/postgresql/src/port/libpgport$(gb_StaticLibrary_PLAINEXT) \
|
2021-05-22 14:42:26 -05:00
|
|
|
$(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \
|
2012-04-05 03:53:08 -05:00
|
|
|
)
|
2012-05-30 05:06:42 -05:00
|
|
|
|
2021-05-22 14:42:26 -05:00
|
|
|
endif # !WNT
|
2012-04-05 03:53:08 -05:00
|
|
|
|
2021-05-22 14:42:26 -05:00
|
|
|
endef # gb_LinkTarget__use_postgresql
|
2012-04-05 03:53:08 -05:00
|
|
|
|
2021-05-22 14:42:26 -05:00
|
|
|
endif # !SYSTEM_POSTGRESQL
|
2012-04-05 03:53:08 -05:00
|
|
|
|
2022-01-27 08:16:47 -06:00
|
|
|
ifneq (,$(filter TRUE,$(ENABLE_KF5) $(ENABLE_GTK3_KDE5)))
|
2018-01-10 09:26:10 -06:00
|
|
|
|
2019-07-09 10:28:29 -05:00
|
|
|
define gb_LinkTarget__use_kf5
|
2018-01-10 09:26:10 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(KF5_CFLAGS)))) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
gbuild: treat $({QT,KF}5_CFLAGS) as cxxflags, not defines
Treat all of QT5_CFLAGS, QT5_GLIB_CFLAGS and KF5_CFLAGS as
C++ flags, since those contain C++ flags in the first place.
Therefore, set them using 'gb_Library_add_cxxflags',
not 'gb_Library_add_defs'.
(Strictly speaking, those variables contain includes as well,
but handling that properly would require splitting this
up further, either in 'configure.ac' or see e.g. how it's done
in 'RepositoryExternal.mk'.)
This also prevents the values of those variables from ending
up in the wrong section in IDE integration generated by
gbuild-to-ide.
Handling them as includes previously resulted e.g. in 'vcl/vcl.pro'
(generated by 'make qtcreator-ide-integration') containing
DEFINES += BOOST_ALL_NO_LIB \
... \
VCLPLUG_GTK3_KDE5_IMPLEMENTATION -isystem /usr/include//KF5 -isystem /usr/include//KF5/KCoreAddons [...]
and Qt Creator would show a (rather unhelpful) warning like the
following when opening a header file inside 'vcl/inc/':
> Warning: The code model could not parse an included file,
> which might lead to incorrect code completion and highlighting,
> for, example.
>
> 4:9: error: macro name must be an identifier
Change-Id: I2bb0c37fdf1112650e8adc712f60737888a8169b
Reviewed-on: https://gerrit.libreoffice.org/73699
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-06-08 06:45:36 -05:00
|
|
|
$(call gb_LinkTarget_add_cxxflags,$(1),\
|
2018-01-10 09:26:10 -06:00
|
|
|
$(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KF5_CFLAGS))) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(KF5_LIBS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2019-07-09 10:28:29 -05:00
|
|
|
else # !ENABLE_KF5
|
2018-01-10 09:26:10 -06:00
|
|
|
|
2019-07-09 10:28:29 -05:00
|
|
|
define gb_LinkTarget__use_kf5
|
2018-01-10 09:26:10 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2019-07-09 10:28:29 -05:00
|
|
|
endif # ENABLE_KF5
|
2018-01-10 09:26:10 -06:00
|
|
|
|
2023-06-22 01:48:05 -05:00
|
|
|
ifneq (,$(filter TRUE,$(ENABLE_KF6)))
|
2018-01-10 09:26:10 -06:00
|
|
|
|
2023-06-22 01:48:05 -05:00
|
|
|
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
|
2018-01-10 09:26:10 -06:00
|
|
|
|
2022-01-27 08:16:47 -06:00
|
|
|
ifneq (,$(filter TRUE,$(ENABLE_QT5) $(ENABLE_GTK3_KDE5)))
|
2017-10-21 08:50:30 -05:00
|
|
|
|
2017-10-30 12:45:46 -05:00
|
|
|
define gb_LinkTarget__use_qt5
|
2017-10-21 08:50:30 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2017-10-30 12:45:46 -05:00
|
|
|
$(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(QT5_CFLAGS)))) \
|
|
|
|
$$(INCLUDE) \
|
2017-10-21 08:50:30 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
2017-10-30 12:45:46 -05:00
|
|
|
$(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(QT5_CFLAGS))) \
|
2017-10-21 08:50:30 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2017-10-30 12:45:46 -05:00
|
|
|
$(QT5_LIBS) \
|
2017-10-21 08:50:30 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-10-30 12:45:46 -05:00
|
|
|
else # !ENABLE_QT5
|
2017-10-21 08:50:30 -05:00
|
|
|
|
2017-10-30 12:45:46 -05:00
|
|
|
define gb_LinkTarget__use_qt5
|
2017-10-21 08:50:30 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-10-30 12:45:46 -05:00
|
|
|
endif # ENABLE_QT5
|
2012-04-28 13:48:14 -05:00
|
|
|
|
qt6: Add a qt6 VCL plugin
This adds a new "qt6" VCL plugin based on Qt 6.
Building the plugin is enabled by autogen option '--enable-qt6'
(and optionally setting 'QT6DIR' as needed).
Use the 'SAL_USE_VCLPLUGIN=qt6' environment variable
before running LO to select this VCL plugin.
Taking qt6 into account at all relevant places certainly
still requires follow-up changes, but
this builds and runs with a self-compiled
qtbase from the 'dev' git branch as of commit
3ce0672143d2eb3c3809f82998a4d71c5800d77a.
I didn't see anything obviously broken
in a quick run, but didn't test much.
This reuses and shares the qt5 VCL plugin code;
the qt6 headers and sources for now just
'#include' the qt5 ones.
Version checks are used for the code places that
need different handling to be built against Qt 6.
The build system parts in this commit were mostly done by
copying the qt5 equivalents, then adapting as needed.
Some notes on things I came across while porting
to qt6:
1) At least in my self-compiled Qt versions,
'moc' (the meta-object compiler) is located
in the 'libexec' subdirectory in 'QT6DIR', while the
Qt 5 equivalent is located in the "bin" subdirectory
of 'QT5DIR', so the configure.ac check uses the former.
2) moc does not process classes from the included headers.
Since the headers in 'vcl/inc/qt6' just '#include' the ones
from 'vcl/inc/qt5', running moc on the qt6 headers doesn't work,
so moc is currently run on the qt5 headers for qt6 as well
(s. 'vcl/CustomTarget_qt6_moc.mk').
That will have to be adapted in case the qt6 VCL plugin
uses "own" headers instead of just including the qt5 ones
at some point.
3) QX11Extras has been removed from Qt 6.
[1] says:
> Changes to Qt X11 Extras
>
> The QX11Info class has been removed.
>
> Clients that still rely on the functionality can include the private
> header <QtGui/private/qtx11extras_p.h> as a stopgap solution. To enable
> private headers use QT += core-private with qmake, or add a project
> dependency to Qt::CorePrivate with CMake.
I didn't take any closer look, just dropped the use of
QtX11Extras for qt6 for now.
4) XCB_ICCCM is no longer needed.
It is only used in qt5 to workaround a Qt bug fixed in Qt 5.12, s.
commit fe2baf9e84e0ca9aeaa683e37076f57fa3f38dca
Author: Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>
Date: Tue Dec 3 08:32:58 2019 +0100
Qt5 fix missing XCB_ICCCM_WM_HINT_WINDOW_GROUP
5) X11-specific code is still used for key modifier handling.
Therefore, still check for the XCB headers when 'USING_X11'
is set in configure.ac, and use a 'QT6_USING_X11' define
(as qt5 uses 'QT5_USING_X11').
6) There's currently no Qt 6 video sink for GStreamer.
As of today, qt-gstreamer is unmaintained and there is no Qt 6 version.
The project's README [2] says:
> 0. Maintenance Notice
> ---------------------
>
> This code is unmaintained. You can use it at your own risk.
>
> If you want to integrate video display in your QML-based UI,
> you should consider using 'qmlglsink', from gst-plugins-good.
> This is a well supported video sink that uses the generic
> gstreamer-gl stack and is in many ways superior to 'qtquick2videosink'
> that is provided by qt-gstreamer. You can use this code as an example:
> https://cgit.freedesktop.org/gstreamer/gst-plugins-good/tree/tests/examples/qt/qmlsink
>
> If you are not interested in using QML in your UI, then you
> may use one of the other elements provided by this module
> (see below). If you do that, it would be helpful to let us
> know that this code is still useful to you. We may consider
> adding these elements in one of the core gstreamer modules.
>
> If you are here for the Qt-style bindings, I'm sorry to disappoint you.
> The alternative is to use the C API, or the GStreamermm C++ API.
> Qt-style bindings are cool, but unfortunately they are very hard
> to maintain because they are written by hand. If you are interested
> in continuing this project, you are welcome to implement a
> generator for them, probably based on GObject-Introspection.
> I am happy to provide directions if you want to pursue such a thing.
Therefore, the Qt video sink handling is qt5-only and the
corresponding handling for GOBJECT (used for the GStreamer
video sink handling) was not taken over for qt6.
This presumably means that video playback in Impress presentations
does not work when using qt6 with they Qt Wayland plugin,
s. tdf#125219 for the corresponding bug for qt5/kf5.
(I did not build the qtwayland module to actually test this, though.
Video playback with the Qt xcb plugin in a Wayland session works.)
[1] https://doc-snapshots.qt.io/qt6-dev/extras-changes-qt6.html
[2] https://cgit.freedesktop.org/gstreamer/qt-gstreamer/tree/README
Change-Id: Ib105ccfb2c3630ec5d5403793a3cd9ba31d85bdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122808
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2021-09-29 04:09:51 -05:00
|
|
|
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
|
|
|
|
|
|
|
|
|
2012-05-27 15:50:41 -05:00
|
|
|
# PYTHON
|
2012-11-27 08:50:53 -06:00
|
|
|
# extra python_headers external because pyuno wrapper must not link python
|
2014-02-11 09:57:35 -06:00
|
|
|
ifneq ($(SYSTEM_PYTHON),)
|
2012-05-27 15:50:41 -05:00
|
|
|
|
2012-11-27 08:50:53 -06:00
|
|
|
define gb_LinkTarget__use_python_headers
|
2012-05-27 15:50:41 -05:00
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
2018-12-06 16:10:27 -06:00
|
|
|
$(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(PYTHON_CFLAGS)))) \
|
2012-05-27 15:50:41 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2014-08-07 12:40:33 -05:00
|
|
|
$(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(PYTHON_CFLAGS)))) \
|
2012-05-27 15:50:41 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
2012-11-27 08:50:53 -06:00
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_python
|
|
|
|
$(call gb_LinkTarget__use_python_headers,$(1))
|
|
|
|
|
2012-05-27 15:50:41 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(PYTHON_LIBS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_PYTHON
|
|
|
|
|
2014-03-18 12:24:15 -05:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,python,\
|
|
|
|
python3 \
|
2021-02-07 08:15:58 -06:00
|
|
|
$(if $(filter WNT,$(OS)),libffi) \
|
2014-03-18 12:24:15 -05:00
|
|
|
))
|
|
|
|
|
2012-11-27 08:50:53 -06:00
|
|
|
define gb_LinkTarget__use_python_headers
|
2015-09-29 11:09:16 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),python3,full)
|
2012-11-27 08:50:53 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/python3 \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/python3/PC \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/python3/Include \
|
2012-11-27 08:50:53 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-05-27 15:50:41 -05:00
|
|
|
define gb_LinkTarget__use_python
|
2012-11-27 08:50:53 -06:00
|
|
|
$(call gb_LinkTarget__use_python_headers,$(1))
|
2015-07-29 05:17:03 -05:00
|
|
|
ifeq ($(OS),MACOSX)
|
|
|
|
$(call gb_LinkTarget_use_generated_package,$(1),python3)
|
|
|
|
else
|
2015-07-29 03:56:57 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),python3)
|
2015-07-29 05:17:03 -05:00
|
|
|
endif
|
2012-05-27 15:50:41 -05:00
|
|
|
|
|
|
|
ifeq ($(OS),WNT)
|
2020-07-17 20:57:20 -05:00
|
|
|
ifeq ($(CPUNAME),X86_64)
|
2022-02-23 01:51:28 -06:00
|
|
|
python_arch_subdir=amd64/
|
2021-03-22 16:13:39 -05:00
|
|
|
else ifeq ($(CPUNAME),AARCH64)
|
2022-02-23 01:51:28 -06:00
|
|
|
python_arch_subdir=arm64/
|
2020-07-17 20:57:20 -05:00
|
|
|
else
|
2022-02-23 01:51:28 -06:00
|
|
|
python_arch_subdir=win32/
|
2020-07-17 20:57:20 -05:00
|
|
|
endif
|
2012-05-27 15:50:41 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/python3/PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
|
2012-05-27 15:50:41 -05:00
|
|
|
)
|
|
|
|
else ifeq ($(OS),MACOSX)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-F$(gb_UnpackedTarball_workdir)/python3/python-inst/@__________________________________________________OOO -framework LibreOfficePython \
|
2012-05-27 15:50:41 -05:00
|
|
|
)
|
|
|
|
else
|
2013-04-21 07:34:50 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/python3 \
|
2020-11-27 16:08:08 -06:00
|
|
|
-lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if $(ENABLE_DBGUTIL),d) \
|
2012-05-27 15:50:41 -05:00
|
|
|
)
|
|
|
|
endif
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2020-01-09 08:06:07 -06:00
|
|
|
# this is only used by python currently
|
|
|
|
define gb_ExternalProject__use_libffi
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libffi)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-05-27 15:50:41 -05:00
|
|
|
endif # SYSTEM_PYTHON
|
|
|
|
|
2012-09-04 14:05:35 -05:00
|
|
|
# ORCUS
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_LIBORCUS),)
|
2012-07-27 21:14:39 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_orcus
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2012-09-09 09:29:10 -05:00
|
|
|
$(ORCUS_CFLAGS) \
|
2012-07-27 21:14:39 -05:00
|
|
|
)
|
2013-04-13 12:29:33 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(ORCUS_LIBS))
|
2013-04-13 09:17:29 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_orcus-parser
|
2012-07-27 21:14:39 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-08-30 22:26:59 -05:00
|
|
|
else # !SYSTEM_LIBORCUS
|
2012-07-27 21:14:39 -05:00
|
|
|
|
2015-06-04 09:09:48 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
|
|
|
orcus \
|
|
|
|
orcus-parser \
|
|
|
|
))
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_orcus
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/liborcus/include \
|
2015-06-04 09:09:48 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
orcus \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_orcus-parser
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/liborcus/include \
|
2015-06-04 09:09:48 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
orcus-parser \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !MSC
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
|
|
|
liborcus \
|
|
|
|
))
|
|
|
|
|
2012-08-31 09:11:32 -05:00
|
|
|
define gb_LinkTarget__use_orcus
|
2015-06-04 09:09:48 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),liborcus)
|
|
|
|
|
2012-09-09 08:29:43 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/liborcus/include \
|
2012-09-09 08:29:43 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2015-06-04 09:09:48 -05:00
|
|
|
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/liborcus/src/liborcus/.libs -lorcus-0.18 \
|
2013-09-19 12:28:36 -05:00
|
|
|
)
|
2012-11-22 23:49:21 -06:00
|
|
|
|
2014-02-11 11:40:09 -06:00
|
|
|
$(if $(SYSTEM_BOOST), \
|
2015-06-04 09:09:48 -05:00
|
|
|
$(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
|
2013-02-17 15:58:21 -06:00
|
|
|
)
|
2012-11-22 23:49:21 -06:00
|
|
|
|
2012-07-27 21:14:39 -05:00
|
|
|
endef
|
|
|
|
|
2013-04-11 22:11:21 -05:00
|
|
|
define gb_LinkTarget__use_orcus-parser
|
2015-06-04 09:09:48 -05:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),liborcus)
|
|
|
|
|
2013-12-17 20:18:46 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/liborcus/include \
|
2013-12-17 20:18:46 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2015-06-04 09:09:48 -05:00
|
|
|
|
2013-09-19 12:28:36 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/liborcus/src/parser/.libs -lorcus-parser-0.18 \
|
2013-04-11 22:11:21 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2015-06-04 09:09:48 -05:00
|
|
|
endif # MSC
|
|
|
|
|
2012-08-30 22:26:59 -05:00
|
|
|
endif # SYSTEM_LIBORCUS
|
2012-05-27 15:50:41 -05:00
|
|
|
|
2022-10-01 06:03:11 -05:00
|
|
|
ifeq ($(ENABLE_EOT),TRUE)
|
2013-11-12 09:44:40 -06:00
|
|
|
|
2022-10-01 06:03:11 -05:00
|
|
|
ifneq ($(SYSTEM_LIBEOT),)
|
2013-11-12 09:44:40 -06:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_libeot
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(LIBEOT_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(LIBEOT_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
gb_ExternalProject__use_libeot :=
|
|
|
|
|
|
|
|
else # !SYSTEM_LIBEOT
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_libeot
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/libeot/inc \
|
2013-11-12 09:44:40 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/libeot/.libs/libeot$(gb_StaticLibrary_PLAINEXT) \
|
2013-11-12 09:44:40 -06:00
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),libeot)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_libeot
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libeot)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2022-10-01 06:03:11 -05:00
|
|
|
endif # SYSTEM_LIBEOT
|
|
|
|
|
|
|
|
else # !ENABLE_EOT
|
2013-11-12 09:44:40 -06:00
|
|
|
|
|
|
|
gb_LinkTarget__use_libeot :=
|
|
|
|
gb_ExternalProject__use_libeot :=
|
|
|
|
|
2022-10-01 06:03:11 -05:00
|
|
|
endif # ENABLE_EOT
|
2013-11-12 09:44:40 -06:00
|
|
|
|
2022-10-01 06:03:11 -05:00
|
|
|
### X11 stuff ###
|
2012-09-27 14:45:47 -05:00
|
|
|
|
2015-09-18 07:12:08 -05:00
|
|
|
ifeq ($(USING_X11), TRUE)
|
2012-09-27 14:45:47 -05:00
|
|
|
|
|
|
|
define gb_LinkTarget__use_Xrandr
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(XRANDR_CFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(XRANDR_LIBS) \
|
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_Xrender
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(XRENDER_CFLAGS) \
|
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
|
|
|
$(XRENDER_LIBS) \
|
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
2015-09-18 07:12:08 -05:00
|
|
|
endif # USING_X11
|
2012-09-27 14:45:47 -05:00
|
|
|
|
2011-08-02 13:22:35 -05:00
|
|
|
|
2013-02-28 06:05:07 -06:00
|
|
|
gb_ExternalProject__use_nss3:=
|
|
|
|
|
2012-08-13 01:19:35 -05:00
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_NSS),)
|
2011-08-11 06:10:14 -05:00
|
|
|
|
2012-08-12 23:57:51 -05:00
|
|
|
define gb_LinkTarget__use_nss3
|
|
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
2012-11-19 09:40:33 -06:00
|
|
|
-DSYSTEM_NSS \
|
2012-08-12 23:57:51 -05:00
|
|
|
)
|
|
|
|
|
2011-08-11 06:10:14 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2011-11-02 15:16:53 -05:00
|
|
|
$(NSS_CFLAGS) \
|
2011-08-11 06:10:14 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2011-11-02 15:16:53 -05:00
|
|
|
$(NSS_LIBS) \
|
2011-08-11 06:10:14 -05:00
|
|
|
)
|
2011-08-11 06:47:00 -05:00
|
|
|
|
2011-08-11 06:10:14 -05:00
|
|
|
endef
|
|
|
|
|
2021-10-19 09:00:53 -05:00
|
|
|
define gb_LinkTarget__use_nssutil3
|
|
|
|
$(call gb_LinkTarget__use_nss3,$(1))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2012-08-12 23:57:51 -05:00
|
|
|
define gb_LinkTarget__use_plc4
|
|
|
|
$(call gb_LinkTarget__use_nss3,$(1))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-02-04 03:04:07 -06:00
|
|
|
define gb_LinkTarget__use_ssl3
|
|
|
|
$(call gb_LinkTarget__use_nss3,$(1))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
else # !SYSTEM_NSS
|
2011-08-11 06:10:14 -05:00
|
|
|
|
2014-03-13 13:51:19 -05:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo, \
|
|
|
|
nss \
|
|
|
|
))
|
|
|
|
|
2012-08-12 23:57:51 -05:00
|
|
|
define gb_LinkTarget__use_nss3
|
2013-01-01 08:39:36 -06:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),nss)
|
2012-08-12 23:57:51 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/nss/dist/public/nss \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/nss/dist/out/include \
|
2012-08-12 23:57:51 -05:00
|
|
|
)
|
|
|
|
|
2013-10-22 17:14:01 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/nspr4.lib \
|
|
|
|
$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/nss3.lib \
|
|
|
|
$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/smime3.lib \
|
2013-10-22 17:14:01 -05:00
|
|
|
)
|
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib \
|
2013-10-22 17:14:01 -05:00
|
|
|
-lnspr4 \
|
|
|
|
-lnss3 \
|
|
|
|
-lsmime3 \
|
2012-08-12 23:57:51 -05:00
|
|
|
)
|
2013-10-22 17:14:01 -05:00
|
|
|
endif
|
2012-08-12 23:57:51 -05:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2011-08-11 06:47:00 -05:00
|
|
|
define gb_LinkTarget__use_plc4
|
2013-01-01 08:39:36 -06:00
|
|
|
$(call gb_LinkTarget_use_package,$(1),nss)
|
2013-10-22 17:14:01 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/plc4.lib \
|
2011-08-11 06:10:14 -05:00
|
|
|
)
|
2013-10-22 17:14:01 -05:00
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib -lplc4 \
|
2013-10-22 17:14:01 -05:00
|
|
|
)
|
|
|
|
endif
|
2011-08-11 06:47:00 -05:00
|
|
|
|
2011-08-11 06:10:14 -05:00
|
|
|
endef
|
|
|
|
|
2013-02-04 03:04:07 -06:00
|
|
|
define gb_LinkTarget__use_ssl3
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),nss)
|
2013-10-22 17:14:01 -05:00
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/ssl3.lib \
|
2013-02-04 03:04:07 -06:00
|
|
|
)
|
2013-10-22 17:14:01 -05:00
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib -lssl3 \
|
2013-10-22 17:14:01 -05:00
|
|
|
)
|
|
|
|
endif
|
2013-02-04 03:04:07 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2021-10-19 09:00:53 -05:00
|
|
|
define gb_LinkTarget__use_nssutil3
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),nss)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/nss/dist/public/nss \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/nss/dist/out/include \
|
2021-10-19 09:00:53 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/nss/dist/out/lib/nssutil3.lib \
|
2021-10-19 09:00:53 -05:00
|
|
|
)
|
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib \
|
2021-10-19 09:00:53 -05:00
|
|
|
-lnssutil3 \
|
|
|
|
)
|
|
|
|
endif
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-02-28 06:05:07 -06:00
|
|
|
define gb_ExternalProject__use_nss3
|
|
|
|
$(call gb_ExternalProject_use_package,$(1),nss)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
endif # SYSTEM_NSS
|
|
|
|
|
2015-11-14 21:39:24 -06:00
|
|
|
ifeq ($(ENABLE_BREAKPAD),TRUE)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_breakpad
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/breakpad/src \
|
2015-11-14 21:39:24 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
2016-03-30 17:00:03 -05:00
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
|
|
|
breakpad \
|
2015-11-14 21:39:24 -06:00
|
|
|
)
|
|
|
|
else
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/breakpad/src/client/linux/libbreakpad_client.a \
|
2015-11-14 21:39:24 -06:00
|
|
|
)
|
|
|
|
endif
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),breakpad)
|
|
|
|
|
2016-02-23 08:08:47 -06:00
|
|
|
endef
|
|
|
|
|
2016-02-27 07:50:13 -06:00
|
|
|
endif # ENABLE_BREAKPAD
|
2015-11-14 21:39:24 -06:00
|
|
|
|
2017-11-24 03:44:42 -06:00
|
|
|
ifeq ($(ENABLE_GPGMEPP),TRUE)
|
|
|
|
|
2017-02-10 09:30:51 -06:00
|
|
|
ifneq ($(SYSTEM_GPGMEPP),)
|
2017-01-30 08:50:55 -06:00
|
|
|
|
2017-02-23 05:57:42 -06:00
|
|
|
gb_ExternalProject__use_gpgmepp:=
|
2017-02-17 02:32:05 -06:00
|
|
|
gb_ExternalProject__use_libassuan:=
|
|
|
|
gb_ExternalProject__use_libgpg-error:=
|
|
|
|
|
2017-02-23 05:57:42 -06:00
|
|
|
define gb_LinkTarget__use_gpgmepp
|
2017-01-30 08:50:55 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
2017-02-10 09:30:51 -06:00
|
|
|
$$(GPGMEPP_CFLAGS) \
|
2017-01-30 08:50:55 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2017-02-10 09:30:51 -06:00
|
|
|
$(GPGMEPP_LIBS) \
|
2017-01-30 08:50:55 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-11-23 11:06:59 -06:00
|
|
|
else ifneq ($(filter GPGMEPP,$(BUILD_TYPE)),) # NON-SYSTEM_GPGME
|
2017-02-15 09:00:16 -06:00
|
|
|
|
2017-02-23 05:57:42 -06:00
|
|
|
define gb_ExternalProject__use_gpgmepp
|
2017-11-15 14:31:07 -06:00
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),gpgmepp)
|
2017-02-17 02:32:05 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
define gb_ExternalProject__use_libassuan
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libassuan)
|
|
|
|
|
|
|
|
endef
|
|
|
|
define gb_ExternalProject__use_libgpg-error
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),libgpg-error)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-11-15 14:31:07 -06:00
|
|
|
ifneq ($(filter WNT,$(OS)),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_libgpg-error
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),libgpg-error)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(GPG_ERROR_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-LIBPATH:$(gb_UnpackedTarball_workdir)/libgpg-error/src/.libs libgpg-error.lib \
|
2017-11-15 14:31:07 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_libassuan
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),libassuan)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(LIBASSUAN_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-LIBPATH:$(gb_UnpackedTarball_workdir)/libassuan/src/.libs libassuan.lib \
|
2017-11-15 14:31:07 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-02-23 05:57:42 -06:00
|
|
|
define gb_LinkTarget__use_gpgmepp
|
2017-02-15 09:00:16 -06:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/gpgmepp/lang/cpp/src \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/gpgmepp/src \
|
2017-02-24 09:54:36 -06:00
|
|
|
$$(GPG_ERROR_CFLAGS) \
|
2017-02-15 09:00:16 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2017-11-15 14:31:07 -06:00
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),\
|
|
|
|
gpgmepp \
|
2017-02-15 09:00:16 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-11-15 14:31:07 -06:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
2020-08-05 04:59:03 -05:00
|
|
|
gpgmepp \
|
2017-11-15 14:31:07 -06:00
|
|
|
libassuan \
|
|
|
|
libgpg-error \
|
|
|
|
))
|
|
|
|
|
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
|
|
|
|
gpgmepp \
|
|
|
|
))
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
2017-10-26 16:25:34 -05:00
|
|
|
ifneq ($(filter MACOSX LINUX,$(OS)),)
|
2017-03-25 22:57:10 -05:00
|
|
|
|
2017-11-15 14:31:07 -06:00
|
|
|
define gb_LinkTarget__use_gpgmepp
|
|
|
|
$(call gb_LinkTarget_use_package,$(1),gpgmepp)
|
|
|
|
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/gpgmepp/lang/cpp/src \
|
|
|
|
-I$(gb_UnpackedTarball_workdir)/gpgmepp/src \
|
2017-11-15 14:31:07 -06:00
|
|
|
$$(GPG_ERROR_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/gpgmepp/lang/cpp/src/.libs/ -lgpgmepp \
|
|
|
|
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-L$(gb_UnpackedTarball_workdir)/gpgmepp/src/.libs/ -lgpgme) \
|
2017-12-08 03:48:09 -06:00
|
|
|
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),$$(GPG_ERROR_LIBS)) \
|
|
|
|
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),$$(LIBASSUAN_LIBS)) \
|
2017-11-15 14:31:07 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2017-03-24 19:28:07 -05:00
|
|
|
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
|
2017-11-15 14:31:07 -06:00
|
|
|
gpgmepp \
|
2017-03-24 19:28:07 -05:00
|
|
|
libassuan \
|
|
|
|
libgpg-error \
|
|
|
|
))
|
|
|
|
|
2017-01-30 08:50:55 -06:00
|
|
|
endif
|
|
|
|
|
2017-03-25 22:57:10 -05:00
|
|
|
endif
|
|
|
|
|
2017-11-24 03:44:42 -06:00
|
|
|
else # !ENABLE_GPGMEPP
|
|
|
|
|
|
|
|
gb_ExternalProject__use_gpgmepp :=
|
|
|
|
gb_ExternalProject__use_libassuan :=
|
|
|
|
gb_ExternalProject__use_libgpg-error :=
|
|
|
|
|
|
|
|
gb_LinkTarget__use_gpgmepp :=
|
|
|
|
gb_LinkTarget__use_libassuan :=
|
|
|
|
gb_LinkTarget__use_libgpg-error :=
|
|
|
|
|
|
|
|
endif # ENABLE_GPGMEPP
|
|
|
|
|
2015-07-08 04:20:19 -05:00
|
|
|
define gb_LinkTarget__use_dconf
|
2019-09-30 10:08:30 -05:00
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(DCONF_CFLAGS) \
|
|
|
|
)
|
|
|
|
|
2015-07-08 04:20:19 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))
|
|
|
|
endef
|
|
|
|
|
2011-09-15 07:01:27 -05:00
|
|
|
### Jars ############################################################
|
|
|
|
|
2018-04-11 09:39:57 -05:00
|
|
|
ifneq ($(SYSTEM_HSQLDB),)
|
|
|
|
|
|
|
|
define gb_Jar__use_hsqldb
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(HSQLDB_JAR))
|
|
|
|
endef
|
|
|
|
define gb_JunitTest__use_hsqldb
|
|
|
|
$(call gb_JunitTest_use_system_jar,$(1),$(HSQLDB_JAR))
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_HSQLDB
|
|
|
|
|
|
|
|
ifeq ($(ENABLE_JAVA),TRUE)
|
|
|
|
$(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
|
|
|
|
hsqldb \
|
|
|
|
))
|
|
|
|
endif
|
|
|
|
|
|
|
|
define gb_Jar__use_hsqldb
|
|
|
|
$(call gb_Jar_use_jar,$(1),hsqldb)
|
|
|
|
endef
|
|
|
|
define gb_JunitTest__use_hsqldb
|
|
|
|
$(call gb_JunitTest_use_jar,$(1),hsqldb)
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_HSQLDB
|
|
|
|
|
|
|
|
|
2014-05-23 00:43:19 -05:00
|
|
|
ifeq ($(ENABLE_SCRIPTING_BEANSHELL),TRUE)
|
|
|
|
|
2014-02-11 12:39:18 -06:00
|
|
|
ifneq ($(SYSTEM_BSH),)
|
2011-10-04 02:44:48 -05:00
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_bsh
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(BSH_JAR))
|
2011-10-04 02:44:48 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_BSH
|
|
|
|
|
2014-05-19 03:20:37 -05:00
|
|
|
ifeq ($(ENABLE_JAVA),TRUE)
|
2014-03-18 14:38:30 -05:00
|
|
|
$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_bsh, \
|
2012-08-17 04:02:49 -05:00
|
|
|
bsh \
|
|
|
|
))
|
2014-05-19 03:20:37 -05:00
|
|
|
endif
|
2012-08-17 04:02:49 -05:00
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_bsh
|
2012-08-17 04:02:49 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),bsh)
|
2011-10-04 02:44:48 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_BSH
|
|
|
|
|
2014-05-23 00:43:19 -05:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifeq ($(ENABLE_SCRIPTING_JAVASCRIPT),TRUE)
|
2011-09-15 07:01:27 -05:00
|
|
|
|
2014-02-11 12:42:28 -06:00
|
|
|
ifneq ($(SYSTEM_RHINO),)
|
2012-05-06 05:49:33 -05:00
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_rhino
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(RHINO_JAR))
|
2012-05-06 05:49:33 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_RHINO
|
|
|
|
|
2014-05-19 03:20:37 -05:00
|
|
|
ifeq ($(ENABLE_JAVA),TRUE)
|
2014-03-18 14:50:02 -05:00
|
|
|
$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
|
2012-08-17 04:02:49 -05:00
|
|
|
js \
|
|
|
|
))
|
2014-05-19 03:20:37 -05:00
|
|
|
endif
|
2012-08-17 04:02:49 -05:00
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_rhino
|
2012-08-17 04:02:49 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),js)
|
2012-05-06 05:49:33 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_RHINO
|
|
|
|
|
2014-05-23 00:43:19 -05:00
|
|
|
endif
|
|
|
|
|
2014-02-11 12:35:22 -06:00
|
|
|
ifneq ($(SYSTEM_JFREEREPORT),)
|
2012-04-07 03:07:35 -05:00
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_flow-engine
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(JFREEREPORT_JAR))
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_flute
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(FLUTE_JAR))
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libbase
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(LIBBASE_JAR))
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libfonts
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(LIBFONTS_JAR))
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libformula
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(LIBFORMULA_JAR))
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_liblayout
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(LIBLAYOUT_JAR))
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libloader
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(LIBLOADER_JAR))
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_librepository
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(LIBREPOSITORY_JAR))
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libserializer
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(LIBSERIALIZER_JAR))
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libxml
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(LIBXML_JAR))
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_sac
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(SAC_JAR))
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_JFREEREPORT
|
|
|
|
|
2014-05-19 03:20:37 -05:00
|
|
|
ifeq ($(ENABLE_JAVA),TRUE)
|
2014-03-18 16:03:00 -05:00
|
|
|
$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
|
2013-10-25 14:01:58 -05:00
|
|
|
flow-engine \
|
2012-08-17 04:02:49 -05:00
|
|
|
flute-1.1.6 \
|
|
|
|
libbase-1.1.6 \
|
|
|
|
libfonts-1.1.6 \
|
|
|
|
libformula-1.1.7 \
|
2013-10-25 14:01:58 -05:00
|
|
|
liblayout \
|
2012-08-17 04:02:49 -05:00
|
|
|
libloader-1.1.6 \
|
|
|
|
librepository-1.1.6 \
|
|
|
|
libserializer-1.1.6 \
|
|
|
|
libxml-1.1.7 \
|
|
|
|
sac \
|
|
|
|
))
|
2014-05-19 03:20:37 -05:00
|
|
|
endif
|
2012-08-17 04:02:49 -05:00
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_flow-engine
|
2013-10-25 14:01:58 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),flow-engine)
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_flute
|
2012-08-17 04:02:49 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),flute-1.1.6)
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libbase
|
2012-08-17 04:02:49 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),libbase-1.1.6)
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libfonts
|
2012-08-17 04:02:49 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),libfonts-1.1.6)
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libformula
|
2012-08-17 04:02:49 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),libformula-1.1.7)
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_liblayout
|
2013-10-25 14:01:58 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),liblayout)
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libloader
|
2012-08-17 04:02:49 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),libloader-1.1.6)
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_librepository
|
2012-08-17 04:02:49 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),librepository-1.1.6)
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libserializer
|
2012-08-17 04:02:49 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),libserializer-1.1.6)
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_libxml
|
2012-08-17 04:02:49 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),libxml-1.1.7)
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
2012-08-15 10:41:25 -05:00
|
|
|
define gb_Jar__use_sac
|
2012-08-17 04:02:49 -05:00
|
|
|
$(call gb_Jar_use_jar,$(1),sac)
|
2012-04-07 03:07:35 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_JFREEREPORT
|
|
|
|
|
2024-09-20 06:25:11 -05:00
|
|
|
# As a guide, Java-Websocket was packaged for Fedora 35
|
|
|
|
# https://src.fedoraproject.org/rpms/Java-WebSocket/tree/f35
|
|
|
|
ifneq ($(SYSTEM_JAVA_WEBSOCKET),)
|
|
|
|
|
|
|
|
define gb_Jar__use_java_websocket
|
|
|
|
$(call gb_Jar_use_system_jar,$(1),$(JAVA_WEBSOCKET_JAR))
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # !SYSTEM_JAVA_WEBSOCKET
|
2023-08-18 08:30:35 -05:00
|
|
|
|
|
|
|
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
|
2012-12-02 03:51:37 -06:00
|
|
|
|
2024-09-20 06:25:11 -05:00
|
|
|
endif # SYSTEM_JAVA_WEBSOCKET
|
|
|
|
|
2012-12-02 03:51:37 -06:00
|
|
|
# Executables
|
|
|
|
|
2012-12-30 05:27:04 -06:00
|
|
|
define gb_Executable__register_bestreversemap
|
|
|
|
$(call gb_Executable_add_runtime_dependencies,bestreversemap,\
|
2022-01-07 23:47:02 -06:00
|
|
|
$(call gb_CondLibSalTextenc,$(call gb_Library_get_target_for_build,sal_textenc)) \
|
2012-12-30 05:27:04 -06:00
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
2012-12-30 06:11:43 -06:00
|
|
|
# TODO depending on the whole URE might be overkill, but I do not have a
|
|
|
|
# Windows machine to debug it...
|
|
|
|
define gb_Executable__register_climaker
|
|
|
|
$(call gb_Executable_add_runtime_dependencies,climaker,\
|
2021-05-21 19:41:58 -05:00
|
|
|
$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
|
2015-11-27 05:49:34 -06:00
|
|
|
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
|
2021-05-30 19:26:43 -05:00
|
|
|
$(call gb_UnoApi_get_target_for_build,udkapi) \
|
2015-11-27 05:49:34 -06:00
|
|
|
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno)
|
2013-05-07 13:41:41 -05:00
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
2014-01-08 06:49:46 -06:00
|
|
|
define gb_Executable__register_cppumaker
|
|
|
|
$(call gb_Executable_add_runtime_dependencies,cppumaker,\
|
2022-01-07 23:47:02 -06:00
|
|
|
$(call gb_CondLibSalTextenc,$(call gb_Library_get_target,sal_textenc)) \
|
2014-01-08 06:49:46 -06:00
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
2013-05-16 02:17:57 -05:00
|
|
|
# This is used to determine what we need for 'build' platform.
|
2013-06-14 05:48:20 -05:00
|
|
|
define gb_Executable__register_gengal
|
2013-06-17 03:41:18 -05:00
|
|
|
$(call gb_Executable_add_runtime_dependencies,gengal,\
|
2021-05-21 19:41:58 -05:00
|
|
|
$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
|
gengal needs Library_localedata_en now
Whatever caused that requirement, but a from-scratch build of e.g.
Gallery_backgrounds failed for me (with a follow-on SIGABRT after
"framework/source/services/desktop.cxx:176: Desktop::~Desktop(): Who forgot to
dispose this service?") because it failed to load
instdir/program/../program/liblocaledata_en.so at
> #1 0x00007fffda0b9671 in i18npool::LocaleDataImpl::getFunctionSymbol(com::sun::star::lang::Locale const&, char const*) (this=0x159b630, rLocale=..., pFunction=0x7fffda136ed8 "getAllFormats0") at i18npool/source/localedata/localedata.cxx:1460
> #2 0x00007fffda0b6a93 in i18npool::LocaleDataImpl::FormatSection::getFunc(i18npool::LocaleDataImpl&, com::sun::star::lang::Locale const&, char const*) (this=0x7fffffffc840, rLocaleData=..., rL=..., pName=0x7fffda136ed8 "getAllFormats0") at i18npool/source/localedata/localedata.cxx:857
> #3 0x00007fffda0b6b5c in i18npool::LocaleDataImpl::getAllFormats(com::sun::star::lang::Locale const&) (this=0x159b630, rLocale=...) at i18npool/source/localedata/localedata.cxx:865
> #4 0x00007fffda0d4815 in NumberFormatCodeMapper::getFormats(com::sun::star::lang::Locale const&) (this=0x1594fa0, rLocale=...) at i18npool/source/numberformatcode/numberformatcode.cxx:150
> #5 0x00007fffda0d4155 in NumberFormatCodeMapper::getAllFormatCode(short, com::sun::star::lang::Locale const&) (this=0x1594fa0, formatUsage=8, rLocale=...) at i18npool/source/numberformatcode/numberformatcode.cxx:92
> #6 0x00007ffff572a824 in LocaleDataWrapper::loadCurrencyFormats() (this=0x159b3f0) at unotools/source/i18n/localedatawrapper.cxx:544
> #7 0x00007ffff572777e in LocaleDataWrapper::loadData() (this=0x159b3f0) at unotools/source/i18n/localedatawrapper.cxx:131
> #8 0x00007ffff57271b4 in LocaleDataWrapper::LocaleDataWrapper(LanguageTag const&, std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> > const&) (this=0x159b3f0, rLanguageTag=..., rOverrideDateAcceptancePatterns=std::__debug::vector of length 0, capacity 0) at unotools/source/i18n/localedatawrapper.cxx:80
> #9 0x00007ffff5766fd6 in SvtSysLocale_Impl::SvtSysLocale_Impl() (this=0x158a4e0) at unotools/source/misc/syslocale.cxx:67
> #10 0x00007ffff5768ad7 in std::construct_at<SvtSysLocale_Impl>(SvtSysLocale_Impl*) (__location=0x158a4e0) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/stl_construct.h:97
> #11 0x00007ffff5768b1c in std::allocator_traits<std::allocator<SvtSysLocale_Impl> >::construct<SvtSysLocale_Impl>(std::allocator<SvtSysLocale_Impl>&, SvtSysLocale_Impl*) (__a=..., __p=0x158a4e0) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/alloc_traits.h:514
> #12 0x00007ffff57688c2 in std::_Sp_counted_ptr_inplace<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>, (__gnu_cxx::_Lock_policy)2>::_Sp_counted_ptr_inplace<>(std::allocator<SvtSysLocale_Impl>) (this=0x158a4d0, __a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:519
> #13 0x00007ffff576860a in std::__shared_count<(__gnu_cxx::_Lock_policy)2>::__shared_count<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>>(SvtSysLocale_Impl*&, std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a8, __p=@0x7fffffffd0a0: 0x0, __a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:650
> #14 0x00007ffff57684c6 in std::__shared_ptr<SvtSysLocale_Impl, (__gnu_cxx::_Lock_policy)2>::__shared_ptr<std::allocator<SvtSysLocale_Impl>>(std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a0, __tag=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:1342
> #15 0x00007ffff576838d in std::shared_ptr<SvtSysLocale_Impl>::shared_ptr<std::allocator<SvtSysLocale_Impl>>(std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a0, __tag=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:409
> #16 0x00007ffff5768164 in std::allocate_shared<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>>(std::allocator<SvtSysLocale_Impl> const&) (__a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:863
> #17 0x00007ffff5767dfc in std::make_shared<SvtSysLocale_Impl>() () at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:879
> #18 0x00007ffff5767583 in SvtSysLocale::SvtSysLocale() (this=0x7fffffffd120) at unotools/source/misc/syslocale.cxx:122
> #19 0x00007ffff015148f in FwkResId(TranslateId) (aId=...) at framework/source/fwe/classes/fwkresid.cxx:22
> #20 0x00007ffff025f333 in framework::Desktop::constructorInit() (this=0x1588850) at framework/source/services/desktop.cxx:106
> #21 0x00007ffff0265c1c in (anonymous namespace)::createDesktop(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (context=...) at framework/source/services/desktop.cxx:1764
> #22 0x00007ffff0265ce5 in framework::getDesktop(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (context=...) at framework/source/services/desktop.cxx:1773
> #23 0x00007ffff0265d9e in com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (context=0x522200) at framework/source/services/desktop.cxx:1782
> #24 0x00007ffff5a5d864 in std::__invoke_impl<com::sun::star::uno::XInterface*, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&>(std::__invoke_other, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__f=@0x54bb58: 0x7ffff0265d5f <com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/invoke.h:61
> #25 0x00007ffff5a551f4 in std::__invoke_r<com::sun::star::uno::XInterface*, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&>(com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__fn=@0x54bb58: 0x7ffff0265d5f <com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/invoke.h:114
> #26 0x00007ffff5a4d254 in std::_Function_handler<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XInterface* (*)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::_M_invoke(std::_Any_data const&, com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__functor=..., __args#0=@0x7fffffffd4f0: 0x522200, __args#1=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/std_function.h:291
> #27 0x00007ffff5a3f913 in std::function<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::operator()(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) const (this=0x54bb58, __args#0=0x522200, __args#1=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/std_function.h:568
> #28 0x00007ffff5a2a396 in cppuhelper::ServiceManager::Data::Implementation::doCreateInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (this=0x54baa0, context=...) at cppuhelper/source/servicemanager.cxx:704
> #29 0x00007ffff5a2a12a in cppuhelper::ServiceManager::Data::Implementation::createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, bool) (this=0x54baa0, context=..., singletonRequest=false) at cppuhelper/source/servicemanager.cxx:672
> #30 0x00007ffff5a2d02d in cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (this=0x523450, aServiceSpecifier=..., Context=...) at cppuhelper/source/servicemanager.cxx:1003
> #31 0x00007ffff6cd9922 in com::sun::star::frame::Desktop::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (the_context=...) at workdir/UnoApiHeadersTarget/offapi/normal/com/sun/star/frame/Desktop.hpp:38
> #32 0x00007ffff6cd8c07 in SfxApplication::Initialize_Impl() (this=0x1588150) at sfx2/source/appl/appinit.cxx:182
> #33 0x00007ffff6cb776a in SfxApplication::GetOrCreate() () at sfx2/source/appl/app.cxx:122
> #34 0x0000000000405ecf in (anonymous namespace)::GalApp::Main() (this=0x4204e0 <vclmain::createApplication()::aGalApp>) at svx/source/gengal/gengal.cxx:254
> #35 0x00007ffff2dd6777 in ImplSVMain() () at vcl/source/app/svmain.cxx:199
> #36 0x00007ffff2dd6898 in SVMain() () at vcl/source/app/svmain.cxx:231
> #37 0x0000000000410f1f in sal_main() () at vcl/source/salmain/salmain.cxx:34
> #38 0x0000000000410efa in main(int, char**) (argc=10, argv=0x7fffffffded8) at vcl/source/salmain/salmain.cxx:29
This fix should remove the need for the cross-build--only fix
0e142fa01972ad28182ca54b855d0ecae0d5c83b "cross-toolset: gengal now needs
localedata_en", which it reverts.
Change-Id: If71b7249c19619a83911c7624e3d99077decba31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120837
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-08-22 04:26:38 -05:00
|
|
|
$(call gb_Library_get_target_for_build,localedata_en) \
|
2021-05-21 19:41:58 -05:00
|
|
|
$(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)) \
|
2020-07-17 15:14:39 -05:00
|
|
|
$(if $(filter host,$(gb_Side)),$(call gb_Package_get_target,postprocess_images)) \
|
2013-09-27 03:58:28 -05:00
|
|
|
$(call gb_Package_get_target_for_build,postprocess_registry) \
|
2015-12-05 00:05:37 -06:00
|
|
|
$(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) \
|
2015-11-27 05:49:34 -06:00
|
|
|
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
|
|
|
|
$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/services/services.rdb \
|
2021-05-30 19:26:43 -05:00
|
|
|
$(call gb_UnoApi_get_target_for_build,offapi) \
|
|
|
|
$(call gb_UnoApi_get_target_for_build,udkapi) \
|
2012-12-30 06:11:43 -06:00
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
2014-02-11 12:17:42 -06:00
|
|
|
ifeq ($(SYSTEM_ICU),)
|
2012-12-30 05:27:04 -06:00
|
|
|
|
|
|
|
define gb_Executable__register_gendict
|
|
|
|
$(call gb_Executable_add_runtime_dependencies,gendict,\
|
|
|
|
$(call gb_Package_get_target_for_build,icu) \
|
Move i18nlangtag lib to URELIB
...as stoc/Library_javavm.mk depends on it since
9b09a217c79e8a35fc4de54c89ef49fbf8f72752 "Resolves: #i86470# Wrong Java locale
when using 'nl' and 'fr'". The i18nlangtag lib in turn depends on libs from
external/liblangtag and external/icu, so those needed to be moved to URELIB,
too.
On Windows, the external icu package was already split into icu and icu_ure
(because "libxml2 is in URE and depends on icuuc*.dll on Windows"), so use that
splitting on all platforms. (However, the corresponding changes that were
necessary in RepositoryExternal.mk suggest that they had been missing for the
split Windows case until now, and things had happened to work by accident?)
On macOS, a library's install name reflects its (URELIB, OOO, ...) layer, and in
external/icu/icu4c-build.patch there is only a single place to set that for all
libs from external/icu. This patch changes that from OOO to URELIB, but for the
icui18n lib that should stay at OOO. The hack to make it URELIB nonetheless
works for now. To clean this up again, either the whole of icu could go into
URE (dropping the icu vs. icu_ure package split completely), or the macOS layers
URELIB and OOO could be combined into one (as the libs end up in the same
directory anyway).
Change-Id: Idc262fa41481d06ba2cae86ad7629cdccb392c07
Reviewed-on: https://gerrit.libreoffice.org/30272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-25 09:46:35 -05:00
|
|
|
$(call gb_Package_get_target_for_build,icu_ure) \
|
2012-12-30 05:27:04 -06:00
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
define gb_Executable__register_localize
|
|
|
|
$(call gb_Executable_add_runtime_dependencies,localize,\
|
2017-06-11 14:56:30 -05:00
|
|
|
$(foreach exec,cfgex helpex propex treex ulfex xrmex,\
|
2012-12-30 05:27:04 -06:00
|
|
|
$(call gb_Executable_get_runtime_dependencies,$(exec)) \
|
|
|
|
) \
|
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
2013-09-20 18:39:41 -05:00
|
|
|
# FIXME ure/services.rdb needs cleanup
|
2013-04-24 03:42:40 -05:00
|
|
|
# The dependencies on ure/services.rdb and udkapi.rdb are implicitly required
|
2012-12-30 05:27:04 -06:00
|
|
|
# due to the settings for URE_SERVICES and URE_TYPES in cppuhelper/source/unorc:
|
|
|
|
define gb_Executable__register_saxparser
|
|
|
|
$(call gb_Executable_add_runtime_dependencies,saxparser,\
|
2021-05-21 19:41:58 -05:00
|
|
|
$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
|
2014-10-13 09:59:33 -05:00
|
|
|
$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
|
2013-05-24 05:24:27 -05:00
|
|
|
$(call gb_Rdb_get_target_for_build,saxparser) \
|
2016-08-16 17:14:54 -05:00
|
|
|
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER_FOR_BUILD)/services.rdb \
|
2021-05-30 19:26:43 -05:00
|
|
|
$(call gb_UnoApi_get_target_for_build,udkapi) \
|
2012-12-30 05:27:04 -06:00
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
2013-04-24 03:42:40 -05:00
|
|
|
# NOTE: the dependencies on ure/services.rdb and udkapi.rdb are implicitly
|
2012-12-30 05:27:04 -06:00
|
|
|
# required due to the settings for URE_SERVICES and URE_TYPES in
|
|
|
|
# cppuhelper/source/unorc
|
|
|
|
define gb_Executable__register_uno
|
|
|
|
$(call gb_Executable_add_runtime_dependencies,uno,\
|
2021-05-21 19:41:58 -05:00
|
|
|
$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
|
2015-11-27 05:49:34 -06:00
|
|
|
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
|
2021-05-30 19:26:43 -05:00
|
|
|
$(call gb_UnoApi_get_target_for_build,udkapi) \
|
2012-12-30 05:27:04 -06:00
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
|
|
# External executables
|
|
|
|
|
2014-02-11 09:49:19 -06:00
|
|
|
ifneq ($(SYSTEM_LIBXML_FOR_BUILD),)
|
2012-12-02 03:51:37 -06:00
|
|
|
|
|
|
|
gb_ExternalExecutable__register_xmllint :=
|
|
|
|
|
|
|
|
else # ! SYSTEM_LIBXML_FOR_BUILD
|
|
|
|
|
|
|
|
define gb_ExternalExecutable__register_xmllint
|
2017-09-14 07:54:07 -05:00
|
|
|
$(call gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/libxml2/$(if $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),libxml2)
|
2014-07-28 03:38:49 -05:00
|
|
|
$(call gb_ExternalExecutable_add_dependencies,xmllint,\
|
|
|
|
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
|
2017-09-14 07:54:07 -05:00
|
|
|
$(call gb_Package_get_target,libxml2) \
|
2014-07-28 03:38:49 -05:00
|
|
|
)
|
2012-12-02 03:51:37 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_LIBXML_FOR_BUILD
|
|
|
|
|
2014-02-11 08:57:18 -06:00
|
|
|
ifneq ($(SYSTEM_LIBXSLT_FOR_BUILD),)
|
2012-12-02 03:51:37 -06:00
|
|
|
|
|
|
|
gb_ExternalExecutable__register_xsltproc :=
|
|
|
|
|
|
|
|
else # ! SYSTEM_LIBXSLT_FOR_BUILD
|
|
|
|
|
|
|
|
define gb_ExternalExecutable__register_xsltproc
|
2017-09-14 08:26:10 -05:00
|
|
|
$(call gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/libxslt/$(if $(filter MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),libxslt)
|
2014-07-28 03:38:49 -05:00
|
|
|
$(call gb_ExternalExecutable_add_dependencies,xsltproc,\
|
|
|
|
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
|
2017-09-14 07:54:07 -05:00
|
|
|
$(call gb_Package_get_target,libxml2) \
|
2017-09-14 08:26:10 -05:00
|
|
|
$(call gb_Package_get_target,libxslt) \
|
2014-07-28 03:38:49 -05:00
|
|
|
)
|
2012-12-02 03:51:37 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_LIBXSLT_FOR_BUILD
|
|
|
|
|
2013-03-05 15:03:38 -06:00
|
|
|
ifeq (,$(PYTHON_FOR_BUILD))
|
2012-12-02 03:51:37 -06:00
|
|
|
|
|
|
|
define gb_ExternalExecutable__register_python
|
2013-03-19 11:27:01 -05:00
|
|
|
ifeq ($(OS),MACOSX)
|
|
|
|
|
|
|
|
# use set_external, to avoid having the command added as prerequisite for the
|
|
|
|
# targets that make use of it. (Otherwise make will choke as it doesn't have a
|
|
|
|
# matching rule to build that specific file)
|
2024-05-05 12:20:33 -05:00
|
|
|
$(call gb_ExternalExecutable_set_external,python,$(gb_UnpackedTarball_workdir)/python3/python-inst/@__________________________________________________OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR))
|
2013-03-19 11:27:01 -05:00
|
|
|
# the Zip ensures that internal python has been built (cannot use the Package
|
|
|
|
# target, as that is not used on Mac)
|
2013-05-16 06:36:24 -05:00
|
|
|
$(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_get_target_for_build,python3))
|
2013-03-19 11:27:01 -05:00
|
|
|
|
|
|
|
else
|
|
|
|
|
2020-07-17 16:03:59 -05:00
|
|
|
$(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))
|
2014-03-19 05:24:13 -05:00
|
|
|
$(call gb_ExternalExecutable_set_precommand,python,$(subst $$,$$$$,$(gb_Python_PRECOMMAND)))
|
2013-03-19 11:27:01 -05:00
|
|
|
$(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3))
|
|
|
|
|
|
|
|
endif
|
2012-12-02 03:51:37 -06:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
2013-03-05 15:03:38 -06:00
|
|
|
else
|
|
|
|
|
|
|
|
define gb_ExternalExecutable__register_python
|
|
|
|
$(call gb_ExternalExecutable_set_external,python,$(PYTHON_FOR_BUILD))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # PYTHON_FOR_BUILD
|
2012-12-02 03:51:37 -06:00
|
|
|
|
2012-12-29 05:56:24 -06:00
|
|
|
ifneq ($(SYSTEM_GENBRK),)
|
|
|
|
|
|
|
|
define gb_ExternalExecutable__register_genbrk
|
|
|
|
$(call gb_ExternalExecutable_set_external,genbrk,$(SYSTEM_GENBRK))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # ! SYSTEM_GENBRK
|
|
|
|
|
|
|
|
define gb_ExternalExecutable__register_genbrk
|
2014-04-18 11:34:40 -05:00
|
|
|
$(call gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build),icu)
|
2014-03-19 04:39:40 -05:00
|
|
|
$(call gb_ExternalExecutable_set_precommand,genbrk,$(subst $$,$$$$,$(gb_ICU_PRECOMMAND)))
|
2012-12-29 05:56:24 -06:00
|
|
|
$(call gb_ExternalExecutable_add_dependencies,genbrk,\
|
|
|
|
$(call gb_Package_get_target_for_build,icu) \
|
Move i18nlangtag lib to URELIB
...as stoc/Library_javavm.mk depends on it since
9b09a217c79e8a35fc4de54c89ef49fbf8f72752 "Resolves: #i86470# Wrong Java locale
when using 'nl' and 'fr'". The i18nlangtag lib in turn depends on libs from
external/liblangtag and external/icu, so those needed to be moved to URELIB,
too.
On Windows, the external icu package was already split into icu and icu_ure
(because "libxml2 is in URE and depends on icuuc*.dll on Windows"), so use that
splitting on all platforms. (However, the corresponding changes that were
necessary in RepositoryExternal.mk suggest that they had been missing for the
split Windows case until now, and things had happened to work by accident?)
On macOS, a library's install name reflects its (URELIB, OOO, ...) layer, and in
external/icu/icu4c-build.patch there is only a single place to set that for all
libs from external/icu. This patch changes that from OOO to URELIB, but for the
icui18n lib that should stay at OOO. The hack to make it URELIB nonetheless
works for now. To clean this up again, either the whole of icu could go into
URE (dropping the icu vs. icu_ure package split completely), or the macOS layers
URELIB and OOO could be combined into one (as the libs end up in the same
directory anyway).
Change-Id: Idc262fa41481d06ba2cae86ad7629cdccb392c07
Reviewed-on: https://gerrit.libreoffice.org/30272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-25 09:46:35 -05:00
|
|
|
$(call gb_Package_get_target_for_build,icu_ure) \
|
2012-12-29 05:56:24 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifneq ($(SYSTEM_GENCCODE),)
|
|
|
|
|
|
|
|
define gb_ExternalExecutable__register_genccode
|
|
|
|
$(call gb_ExternalExecutable_set_external,genccode,$(SYSTEM_GENCCODE))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # ! SYSTEM_GENCCODE
|
|
|
|
|
|
|
|
define gb_ExternalExecutable__register_genccode
|
2014-04-18 11:34:40 -05:00
|
|
|
$(call gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build),icu)
|
2014-03-19 04:39:40 -05:00
|
|
|
$(call gb_ExternalExecutable_set_precommand,genccode,$(subst $$,$$$$,$(gb_ICU_PRECOMMAND)))
|
2012-12-29 05:56:24 -06:00
|
|
|
$(call gb_ExternalExecutable_add_dependencies,genccode,\
|
|
|
|
$(call gb_Package_get_target_for_build,icu) \
|
Move i18nlangtag lib to URELIB
...as stoc/Library_javavm.mk depends on it since
9b09a217c79e8a35fc4de54c89ef49fbf8f72752 "Resolves: #i86470# Wrong Java locale
when using 'nl' and 'fr'". The i18nlangtag lib in turn depends on libs from
external/liblangtag and external/icu, so those needed to be moved to URELIB,
too.
On Windows, the external icu package was already split into icu and icu_ure
(because "libxml2 is in URE and depends on icuuc*.dll on Windows"), so use that
splitting on all platforms. (However, the corresponding changes that were
necessary in RepositoryExternal.mk suggest that they had been missing for the
split Windows case until now, and things had happened to work by accident?)
On macOS, a library's install name reflects its (URELIB, OOO, ...) layer, and in
external/icu/icu4c-build.patch there is only a single place to set that for all
libs from external/icu. This patch changes that from OOO to URELIB, but for the
icui18n lib that should stay at OOO. The hack to make it URELIB nonetheless
works for now. To clean this up again, either the whole of icu could go into
URE (dropping the icu vs. icu_ure package split completely), or the macOS layers
URELIB and OOO could be combined into one (as the libs end up in the same
directory anyway).
Change-Id: Idc262fa41481d06ba2cae86ad7629cdccb392c07
Reviewed-on: https://gerrit.libreoffice.org/30272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-25 09:46:35 -05:00
|
|
|
$(call gb_Package_get_target_for_build,icu_ure) \
|
2012-12-29 05:56:24 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifneq ($(SYSTEM_GENCMN),)
|
|
|
|
|
|
|
|
define gb_ExternalExecutable__register_gencmn
|
|
|
|
$(call gb_ExternalExecutable_set_external,gencmn,$(SYSTEM_GENCMN))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
else # ! SYSTEM_GENCMN
|
|
|
|
|
|
|
|
define gb_ExternalExecutable__register_gencmn
|
2014-04-18 11:34:40 -05:00
|
|
|
$(call gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build),icu)
|
2014-03-19 04:39:40 -05:00
|
|
|
$(call gb_ExternalExecutable_set_precommand,gencmn,$(subst $$,$$$$,$(gb_ICU_PRECOMMAND)))
|
2012-12-29 05:56:24 -06:00
|
|
|
$(call gb_ExternalExecutable_add_dependencies,gencmn,\
|
|
|
|
$(call gb_Package_get_target_for_build,icu) \
|
Move i18nlangtag lib to URELIB
...as stoc/Library_javavm.mk depends on it since
9b09a217c79e8a35fc4de54c89ef49fbf8f72752 "Resolves: #i86470# Wrong Java locale
when using 'nl' and 'fr'". The i18nlangtag lib in turn depends on libs from
external/liblangtag and external/icu, so those needed to be moved to URELIB,
too.
On Windows, the external icu package was already split into icu and icu_ure
(because "libxml2 is in URE and depends on icuuc*.dll on Windows"), so use that
splitting on all platforms. (However, the corresponding changes that were
necessary in RepositoryExternal.mk suggest that they had been missing for the
split Windows case until now, and things had happened to work by accident?)
On macOS, a library's install name reflects its (URELIB, OOO, ...) layer, and in
external/icu/icu4c-build.patch there is only a single place to set that for all
libs from external/icu. This patch changes that from OOO to URELIB, but for the
icui18n lib that should stay at OOO. The hack to make it URELIB nonetheless
works for now. To clean this up again, either the whole of icu could go into
URE (dropping the icu vs. icu_ure package split completely), or the macOS layers
URELIB and OOO could be combined into one (as the libs end up in the same
directory anyway).
Change-Id: Idc262fa41481d06ba2cae86ad7629cdccb392c07
Reviewed-on: https://gerrit.libreoffice.org/30272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-25 09:46:35 -05:00
|
|
|
$(call gb_Package_get_target_for_build,icu_ure) \
|
2012-12-29 05:56:24 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
2015-07-03 04:58:27 -05:00
|
|
|
ifneq ($(SYSTEM_BZIP2),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_bzip2
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$(BZIP2_CFLAGS) \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(BZIP2_LIBS))
|
|
|
|
|
|
|
|
endef
|
2015-07-03 06:46:38 -05:00
|
|
|
|
2015-07-03 04:58:27 -05:00
|
|
|
gb_ExternalProject__use_bzip2 :=
|
|
|
|
|
|
|
|
else # !SYSTEM_BZIP2
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_bzip2
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/bzip2 \
|
2015-07-03 04:58:27 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
2015-07-14 16:36:37 -05:00
|
|
|
|
|
|
|
ifeq ($(COM),MSC)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
$(gb_UnpackedTarball_workdir)/bzip2/libbz2.lib \
|
2015-07-14 16:36:37 -05:00
|
|
|
)
|
|
|
|
else
|
2015-07-03 06:46:38 -05:00
|
|
|
$(call gb_LinkTarget_add_libs,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-L$(gb_UnpackedTarball_workdir)/bzip2 -lbz2 \
|
2015-07-03 06:46:38 -05:00
|
|
|
)
|
2015-07-14 16:36:37 -05:00
|
|
|
endif
|
|
|
|
|
2015-07-07 02:24:45 -05:00
|
|
|
$(call gb_LinkTarget_use_external_project,$(1),bzip2)
|
2015-07-03 04:58:27 -05:00
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_bzip2
|
|
|
|
$(call gb_ExternalProject_use_external_project,$(1),bzip2)
|
|
|
|
endef
|
|
|
|
|
2023-09-20 06:12:54 -05:00
|
|
|
endif # SYSTEM_BZIP2
|
2015-07-03 04:58:27 -05:00
|
|
|
|
2016-04-12 13:06:04 -05:00
|
|
|
define gb_LinkTarget__use_clew
|
|
|
|
$(call gb_LinkTarget_set_include,$(1), \
|
|
|
|
-I$(SRCDIR)/external/clew/source/include \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),clew)
|
|
|
|
endef
|
|
|
|
|
2017-03-06 11:49:00 -06:00
|
|
|
ifneq ($(ENABLE_PDFIUM),)
|
2017-02-08 04:19:39 -06:00
|
|
|
define gb_LinkTarget__use_pdfium
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/pdfium/public \
|
2020-01-22 14:02:05 -06:00
|
|
|
-DCOMPONENT_BUILD \
|
2017-02-08 04:19:39 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_libraries,$(1),pdfium)
|
|
|
|
endef
|
|
|
|
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\
|
|
|
|
pdfium \
|
|
|
|
))
|
2017-03-06 11:49:00 -06:00
|
|
|
endif
|
2017-02-08 04:19:39 -06:00
|
|
|
|
2022-02-20 05:13:19 -06:00
|
|
|
ifneq ($(SYSTEM_DRAGONBOX),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_dragonbox
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$$(DRAGONBOX_CFLAGS) \
|
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
|
|
|
else
|
|
|
|
|
Use Dragonbox to implement doubleTo*String*
This header-only library is accurate in decimal representation of
doubles; provides API that allows to create custom representation
- so it's possible to use custom decimal separators and grouping.
This allows to unify all corner cases: integers, numbers close to
DBL_MAX, up-rounding to the next decade.
Note that Dragonbox creates the shortest decimal representation
of the number, that is unambiguously convertible back to the same
number; thus it may hide trailing digits that are unneeded for
such conversion.
The functional changes are minimal, and beneficial:
1. Rounding numbers close to DBL_MAX now takes into account the
bEraseTrailingDecZeros argument, as it should, allowing to have
"1.8E+308" for rounding DBL_MAX to 2 decimals without trailing
zeroes, instead of previous "1.80E+308".
2. Incorrect rounding is fixed in some cases, e.g. 9.9999999999999929
rounded to 10 previously using rtl_math_DecimalPlaces_Max.
3. Representing the number in the shortest way may change display
of some printed numbers. E.g., 5th greatest double is represented
as "1.797693134862315E+308" instead of a bit longer, but giving
the same double on roundtrip, "1.7976931348623149E+308". This would
generally look better for some numbers similar to the famous 0.1,
where users would likely expect more "round" representation where
it's unambiguous (but we still truncate to 15 significant decimals
anyway - so there's no point in pretending to provide exact digits
for actual binary representation).
These are reflected in the unit tests affected by the change.
Change-Id: I05e20274a30eec499593ee3e9ec070e1269232a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129948
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-02-15 00:20:52 -06:00
|
|
|
define gb_LinkTarget__use_dragonbox
|
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),dragonbox)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/dragonbox/include/\
|
Use Dragonbox to implement doubleTo*String*
This header-only library is accurate in decimal representation of
doubles; provides API that allows to create custom representation
- so it's possible to use custom decimal separators and grouping.
This allows to unify all corner cases: integers, numbers close to
DBL_MAX, up-rounding to the next decade.
Note that Dragonbox creates the shortest decimal representation
of the number, that is unambiguously convertible back to the same
number; thus it may hide trailing digits that are unneeded for
such conversion.
The functional changes are minimal, and beneficial:
1. Rounding numbers close to DBL_MAX now takes into account the
bEraseTrailingDecZeros argument, as it should, allowing to have
"1.8E+308" for rounding DBL_MAX to 2 decimals without trailing
zeroes, instead of previous "1.80E+308".
2. Incorrect rounding is fixed in some cases, e.g. 9.9999999999999929
rounded to 10 previously using rtl_math_DecimalPlaces_Max.
3. Representing the number in the shortest way may change display
of some printed numbers. E.g., 5th greatest double is represented
as "1.797693134862315E+308" instead of a bit longer, but giving
the same double on roundtrip, "1.7976931348623149E+308". This would
generally look better for some numbers similar to the famous 0.1,
where users would likely expect more "round" representation where
it's unambiguous (but we still truncate to 15 significant decimals
anyway - so there's no point in pretending to provide exact digits
for actual binary representation).
These are reflected in the unit tests affected by the change.
Change-Id: I05e20274a30eec499593ee3e9ec070e1269232a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129948
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-02-15 00:20:52 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
2022-02-20 05:13:19 -06:00
|
|
|
endif
|
|
|
|
|
tdf#130725: use strtod by David M. Gay to make sure we get the nearest
... representation of given decimal.
Use dtoa.c from https://www.netlib.org/fp/dtoa.c to build a custom
static library that doesn't use current locale (unlike strtod from
stdlib.h). This is the implementation used by e.g. python and nss
(search for "dtoa.c" under UnpackedTarball).
To avoid name clash with the standard strtod, rename the function
to strtod_nolocale.
Size of buffer on stack in ImpSvNumberInputScan::StringToDouble is
256 characters. Logging function usage in make check, of ~124 600
invocations, the longest string was 14 characters, average being
2.1 characters. So heap allocation is unlikely in scenarios with
intensive function usage.
After std::from_chars is available in baseline compilers, external
library can be dropped, and call to strtod_nolocale replaced with
the standard function.
The artifact at https://dev-www.libreoffice.org/src/dtoa-20180411.tgz
is created with
mkdir dtoa && mkdir dtoa/src && wget https://www.netlib.org/fp/dtoa.c -O dtoa/src/dtoa.c && \
printf 'd8bab255476f39ea495c8c8ed164f9077da926e6ca7afb9ad3c56d337c4484fe dtoa/src/dtoa.c' | sha256sum -c && \
tar -c --owner=0 --group=0 --mode=go=r,u=rw --mtime='Wed, 11 Apr 2018 15:59:39 GMT' dtoa/src/dtoa.c | gzip -n > dtoa-20180411.tgz && \
printf '0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 dtoa-20180411.tgz' | sha256sum -c
(where the date "Wed, 11 Apr 2018 15:59:39 GMT" is from
`wget -S https://www.netlib.org/fp/dtoa.c`
"Last-Modified: Wed, 11 Apr 2018 15:59:39 GMT" header).
Change-Id: Ia61b7678e257c4bc1ff193f3f856d611aa5c1a21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88854
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-02-23 10:19:10 -06:00
|
|
|
define gb_LinkTarget__use_dtoa
|
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),dtoa)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/dtoa/include/\
|
tdf#130725: use strtod by David M. Gay to make sure we get the nearest
... representation of given decimal.
Use dtoa.c from https://www.netlib.org/fp/dtoa.c to build a custom
static library that doesn't use current locale (unlike strtod from
stdlib.h). This is the implementation used by e.g. python and nss
(search for "dtoa.c" under UnpackedTarball).
To avoid name clash with the standard strtod, rename the function
to strtod_nolocale.
Size of buffer on stack in ImpSvNumberInputScan::StringToDouble is
256 characters. Logging function usage in make check, of ~124 600
invocations, the longest string was 14 characters, average being
2.1 characters. So heap allocation is unlikely in scenarios with
intensive function usage.
After std::from_chars is available in baseline compilers, external
library can be dropped, and call to strtod_nolocale replaced with
the standard function.
The artifact at https://dev-www.libreoffice.org/src/dtoa-20180411.tgz
is created with
mkdir dtoa && mkdir dtoa/src && wget https://www.netlib.org/fp/dtoa.c -O dtoa/src/dtoa.c && \
printf 'd8bab255476f39ea495c8c8ed164f9077da926e6ca7afb9ad3c56d337c4484fe dtoa/src/dtoa.c' | sha256sum -c && \
tar -c --owner=0 --group=0 --mode=go=r,u=rw --mtime='Wed, 11 Apr 2018 15:59:39 GMT' dtoa/src/dtoa.c | gzip -n > dtoa-20180411.tgz && \
printf '0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 dtoa-20180411.tgz' | sha256sum -c
(where the date "Wed, 11 Apr 2018 15:59:39 GMT" is from
`wget -S https://www.netlib.org/fp/dtoa.c`
"Last-Modified: Wed, 11 Apr 2018 15:59:39 GMT" header).
Change-Id: Ia61b7678e257c4bc1ff193f3f856d611aa5c1a21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88854
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-02-23 10:19:10 -06:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
|
|
|
dtoa \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_dtoa
|
|
|
|
$(call gb_ExternalProject_use_static_libraries,$(1),dtoa)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
2020-05-13 03:28:05 -05:00
|
|
|
ifneq ($(SYSTEM_BOX2D),)
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_box2d
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
-DSYSTEM_BOX2D \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(BOX2D_CFLAGS) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_add_libs,$(1),$(BOX2D_LIBS))
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
gb_ExternalProject__use_box2d :=
|
|
|
|
|
|
|
|
else # !SYSTEM_BOX2D
|
|
|
|
|
|
|
|
define gb_LinkTarget__use_box2d
|
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),box2d)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/box2d/include/\
|
2020-05-13 03:28:05 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
|
|
|
box2d \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
define gb_ExternalProject__use_box2d
|
|
|
|
$(call gb_ExternalProject_use_static_libraries,$(1),box2d)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
endif # SYSTEM_BOX2D
|
|
|
|
|
2023-10-30 14:27:12 -05:00
|
|
|
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
|
|
|
|
|
2023-10-02 07:56:04 -05:00
|
|
|
define gb_LinkTarget__use_zxcvbn-c
|
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),zxcvbn-c)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/zxcvbn-c\
|
2023-10-02 07:56:04 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
|
|
|
zxcvbn-c \
|
|
|
|
)
|
|
|
|
endef
|
2023-10-30 14:27:12 -05:00
|
|
|
endif
|
|
|
|
|
2023-10-02 07:56:04 -05:00
|
|
|
|
2021-03-06 02:51:25 -06:00
|
|
|
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),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/zxing/core/src/\
|
2021-03-06 02:51:25 -06:00
|
|
|
$$(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
|
|
|
|
|
2022-07-16 05:17:20 -05:00
|
|
|
|
2023-06-17 07:38:27 -05:00
|
|
|
ifneq ($(SYSTEM_FROZEN),)
|
|
|
|
define gb_LinkTarget__use_frozen
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
$$(INCLUDE) \
|
|
|
|
$(FROZEN_CFLAGS)
|
|
|
|
)
|
|
|
|
endef
|
|
|
|
else
|
2022-07-16 05:17:20 -05:00
|
|
|
define gb_LinkTarget__use_frozen
|
|
|
|
$(call gb_LinkTarget_use_unpacked,$(1),frozen)
|
|
|
|
$(call gb_LinkTarget_set_include,$(1),\
|
2024-05-05 12:20:33 -05:00
|
|
|
-I$(gb_UnpackedTarball_workdir)/frozen/include/\
|
2022-07-16 05:17:20 -05:00
|
|
|
$$(INCLUDE) \
|
|
|
|
)
|
|
|
|
endef
|
2023-06-17 07:38:27 -05:00
|
|
|
endif
|
2022-07-16 05:17:20 -05:00
|
|
|
|
qt6: Add a qt6 VCL plugin
This adds a new "qt6" VCL plugin based on Qt 6.
Building the plugin is enabled by autogen option '--enable-qt6'
(and optionally setting 'QT6DIR' as needed).
Use the 'SAL_USE_VCLPLUGIN=qt6' environment variable
before running LO to select this VCL plugin.
Taking qt6 into account at all relevant places certainly
still requires follow-up changes, but
this builds and runs with a self-compiled
qtbase from the 'dev' git branch as of commit
3ce0672143d2eb3c3809f82998a4d71c5800d77a.
I didn't see anything obviously broken
in a quick run, but didn't test much.
This reuses and shares the qt5 VCL plugin code;
the qt6 headers and sources for now just
'#include' the qt5 ones.
Version checks are used for the code places that
need different handling to be built against Qt 6.
The build system parts in this commit were mostly done by
copying the qt5 equivalents, then adapting as needed.
Some notes on things I came across while porting
to qt6:
1) At least in my self-compiled Qt versions,
'moc' (the meta-object compiler) is located
in the 'libexec' subdirectory in 'QT6DIR', while the
Qt 5 equivalent is located in the "bin" subdirectory
of 'QT5DIR', so the configure.ac check uses the former.
2) moc does not process classes from the included headers.
Since the headers in 'vcl/inc/qt6' just '#include' the ones
from 'vcl/inc/qt5', running moc on the qt6 headers doesn't work,
so moc is currently run on the qt5 headers for qt6 as well
(s. 'vcl/CustomTarget_qt6_moc.mk').
That will have to be adapted in case the qt6 VCL plugin
uses "own" headers instead of just including the qt5 ones
at some point.
3) QX11Extras has been removed from Qt 6.
[1] says:
> Changes to Qt X11 Extras
>
> The QX11Info class has been removed.
>
> Clients that still rely on the functionality can include the private
> header <QtGui/private/qtx11extras_p.h> as a stopgap solution. To enable
> private headers use QT += core-private with qmake, or add a project
> dependency to Qt::CorePrivate with CMake.
I didn't take any closer look, just dropped the use of
QtX11Extras for qt6 for now.
4) XCB_ICCCM is no longer needed.
It is only used in qt5 to workaround a Qt bug fixed in Qt 5.12, s.
commit fe2baf9e84e0ca9aeaa683e37076f57fa3f38dca
Author: Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>
Date: Tue Dec 3 08:32:58 2019 +0100
Qt5 fix missing XCB_ICCCM_WM_HINT_WINDOW_GROUP
5) X11-specific code is still used for key modifier handling.
Therefore, still check for the XCB headers when 'USING_X11'
is set in configure.ac, and use a 'QT6_USING_X11' define
(as qt5 uses 'QT5_USING_X11').
6) There's currently no Qt 6 video sink for GStreamer.
As of today, qt-gstreamer is unmaintained and there is no Qt 6 version.
The project's README [2] says:
> 0. Maintenance Notice
> ---------------------
>
> This code is unmaintained. You can use it at your own risk.
>
> If you want to integrate video display in your QML-based UI,
> you should consider using 'qmlglsink', from gst-plugins-good.
> This is a well supported video sink that uses the generic
> gstreamer-gl stack and is in many ways superior to 'qtquick2videosink'
> that is provided by qt-gstreamer. You can use this code as an example:
> https://cgit.freedesktop.org/gstreamer/gst-plugins-good/tree/tests/examples/qt/qmlsink
>
> If you are not interested in using QML in your UI, then you
> may use one of the other elements provided by this module
> (see below). If you do that, it would be helpful to let us
> know that this code is still useful to you. We may consider
> adding these elements in one of the core gstreamer modules.
>
> If you are here for the Qt-style bindings, I'm sorry to disappoint you.
> The alternative is to use the C API, or the GStreamermm C++ API.
> Qt-style bindings are cool, but unfortunately they are very hard
> to maintain because they are written by hand. If you are interested
> in continuing this project, you are welcome to implement a
> generator for them, probably based on GObject-Introspection.
> I am happy to provide directions if you want to pursue such a thing.
Therefore, the Qt video sink handling is qt5-only and the
corresponding handling for GOBJECT (used for the GStreamer
video sink handling) was not taken over for qt6.
This presumably means that video playback in Impress presentations
does not work when using qt6 with they Qt Wayland plugin,
s. tdf#125219 for the corresponding bug for qt5/kf5.
(I did not build the qtwayland module to actually test this, though.
Video playback with the Qt xcb plugin in a Wayland session works.)
[1] https://doc-snapshots.qt.io/qt6-dev/extras-changes-qt6.html
[2] https://cgit.freedesktop.org/gstreamer/qt-gstreamer/tree/README
Change-Id: Ib105ccfb2c3630ec5d5403793a3cd9ba31d85bdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122808
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2021-09-29 04:09:51 -05:00
|
|
|
# vim: set noet sw=4 ts=4:
|