summaryrefslogtreecommitdiffstats
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-09-21 17:02:31 +0100
committerAndras Timar <andras.timar@collabora.com>2020-09-24 13:12:57 +0200
commit96a8c7b3ad21db406407a141eab1c52341273721 (patch)
tree30951e63ae299c17d1355884bcca47dccaae67d7 /RepositoryExternal.mk
parentofz#25684 keep ParseCMAP within legal area (diff)
downloadcore-96a8c7b3ad21db406407a141eab1c52341273721.tar.gz
core-96a8c7b3ad21db406407a141eab1c52341273721.zip
add an explicit --disable-qrcodegen configure option co-6.4-5
Change-Id: If8e965fa955aecdb9e7011bdddc690de9cad0c4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103120 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103158 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9c97d3af05f9..884bececcf08 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4163,6 +4163,8 @@ gb_ExternalProject__use_qrcodegen :=
else # !SYSTEM_QRCODEGEN
+ifneq ($(ENABLE_QRCODEGEN),)
+
define gb_LinkTarget__use_qrcodegen
$(call gb_LinkTarget_use_unpacked,$(1),qrcodegen)
$(call gb_LinkTarget_set_include,$(1),\
@@ -4180,6 +4182,13 @@ $(call gb_ExternalProject_use_static_libraries,$(1),qrcodegen)
endef
+else # !ENABLE_QRCODEGEN
+
+define gb_LinkTarget__use_qrcodegen
+endef
+
+endif # ENABLE_QRCODEGEN
+
endif # SYSTEM_QRCODEGEN
$(eval $(call gb_Helper_register_packages_for_install,ucrt_binarytable,\