diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-07-31 21:56:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-01 09:13:22 +0200 |
| commit | 4b4c7e76e6c2ea0d47a42a5107352d3ad7341fbf (patch) | |
| tree | f6d1f14feec71b37a556a7a44829240631b1b5bb /sysui | |
| parent | 12062cb281dce9b23bf643dce7744520cf8820f7 (diff) | |
Only build LOKDocView-0.1.gir when necessary
Prior to 634844354ee6ed884128086a80c3ee32c889d8c9 "sysui: fix rpm errors in
freedesktop-menus (4.14.1)" it had been build as part of
sysui/desktop/share/create_tree.sh, which is presumably only called when
building for deb or rpm PKGFORMAT. Building it now in more cases started to
cause issues, like
> g-ir-scanner: link: /home/sbergman/llvm/inst/bin/clang --gcc-toolchain=/home/sbergman/gcc/trunk/inst -fdiagnostics-color -fsanitize=address -fsanitize-address-globals-dead-stripping -fsanitize-address-use-after-scope -fsanitize=undefined -fsanitize=local-bounds -fsanitize=nullability -o /home/sbergman/lo/core/tmp-introspectga_nlzjv/LOKDocView-0.1 /home/sbergman/lo/core/tmp-introspectga_nlzjv/LOKDocView-0.1.o -L. -Wl,-rpath,. -Wl,--no-as-needed -L/home/sbergman/lo/core/instdir/program -Wl,-rpath,/home/sbergman/lo/core/instdir/program -llibreofficekitgtk -lgio-2.0 -lgobject-2.0 -Wl,--export-dynamic -pthread -lgmodule-2.0 -lglib-2.0
> /usr/bin/ld: /home/sbergman/lo/core/instdir/program/liblibreofficekitgtk.so: undefined reference to `__ubsan_handle_function_type_mismatch_v1'
> /usr/bin/ld: /home/sbergman/lo/core/instdir/program/liblibreofficekitgtk.so: undefined reference to `__ubsan_vptr_type_cache'
> /usr/bin/ld: /home/sbergman/lo/core/instdir/program/liblibreofficekitgtk.so: undefined reference to `__ubsan_handle_dynamic_type_cache_miss'
in an ASan+UBSan build (where g-ir-scanner should apparently use CXX instead of
CC for linking, but there appears to be no easy way to tell g-ir-scanner to do
so).
Change-Id: I5a960c6ed387722138d4b3d156c87038f3e5b8ca
Reviewed-on: https://gerrit.libreoffice.org/76769
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/CustomTarget_share.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index 231aa4ff930d..9afe6da42a45 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 $(INTROSPECTION_SCANNER),\ + $(if $(filter deb rpm,$(PKGFORMAT)),$(if $(INTROSPECTION_SCANNER),\ $(product)/LOKDocView-0.1.gir \ - $(product)/LOKDocView-0.1.typelib) \ + $(product)/LOKDocView-0.1.typelib)) \ $(product)/launcherlist) \ )) |