summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-08-05 13:52:50 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-08-06 11:13:48 +0200
commitb40018763538abc6ca5419ef433a5a1754100885 (patch)
tree2eed27eb3d8714c89bf4a5911fb8392742b47a0a /sysui
parentd2750b7eb02d6f1c8866199c98fe2e2286639b88 (diff)
Introduce explicit --enable-introspection
4b4c7e76e6c2ea0d47a42a5107352d3ad7341fbf "Only build LOKDocView-0.1.gir when necessary" had erroneously assumed that LOKDocView-0.1.{gir,typelib} need to be built when PKGFORMAT contains "deb" or "rpm". But instead, they need to be built only for some 3rd-party Linux distro builds, never for TDF builds. Make that explicit with a new --enable-introspection, which those 3rd-party Linux distros will now have to specify (probably along with other fixes to where they pick up those LOKDocView-0.1.{gir,typelib} files after 634844354ee6ed884128086a80c3ee32c889d8c9 "sysui: fix rpm errors in freedesktop-menus (4.14.1)" had moved them around). That way, builds that broke after 634844354ee6ed884128086a80c3ee32c889d8c9 "sysui: fix rpm errors in freedesktop-menus (4.14.1)" (like my ASan+UBSan one that 4b4c7e76e6c2ea0d47a42a5107352d3ad7341fbf "Only build LOKDocView-0.1.gir when necessary" had tried to fix) can be fixed with an (implicit) --disable-introspection. This commit contains a revert of 4b4c7e76e6c2ea0d47a42a5107352d3ad7341fbf "Only build LOKDocView-0.1.gir when necessary", which it supersedes. Change-Id: Idb618e3353da7d68a2e552b0f290775c02327733 Reviewed-on: https://gerrit.libreoffice.org/76997 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sysui')
-rw-r--r--sysui/CustomTarget_share.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 9afe6da42a45..231aa4ff930d 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -127,9 +127,9 @@ $(eval $(call gb_CustomTarget_register_targets,sysui/share,\
$(product)/openoffice.keys \
$(product)/openoffice.sh \
$(product)/create_tree.sh \
- $(if $(filter deb rpm,$(PKGFORMAT)),$(if $(INTROSPECTION_SCANNER),\
+ $(if $(INTROSPECTION_SCANNER),\
$(product)/LOKDocView-0.1.gir \
- $(product)/LOKDocView-0.1.typelib)) \
+ $(product)/LOKDocView-0.1.typelib) \
$(product)/launcherlist) \
))