diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-05-25 08:21:20 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-05-28 20:59:29 +0200 |
| commit | 0a0c5f7a755fdae43ad07764e36d6e0503828fd7 (patch) | |
| tree | a5b915034b9171405a5760116d03564036aa82c4 /external | |
| parent | de38424accf9c26a9a6e3b89727dac54d3c3d52c (diff) | |
ExternalProject_libxml2 still needs to build the xmllint executable
No idea why fd6cbd983a3021d22321854d0414bdc42c6cb1b7 "upgrade to libxml2-2.11.4"
started to only explicitly make libxml2.la (the commit message doesn't say), but
that caused at least <https://ci.libreoffice.org/job/lo_ubsan/2788/> to fail
with
> make[1]: *** Deleting file '/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/CustomTarget/sfx2/classification/example.validated'
> [build VAL] CustomTarget/sfx2/classification/example.validated
> /bin/sh: /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/libxml2//xmllint: No such file or directory
> make[1]: *** [/home/tdf/lode/jenkins/workspace/lo_ubsan/sfx2/CustomTarget_classification.mk:20: /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/CustomTarget/sfx2/classification/example.validated] Error 1
Change-Id: I7e7aa2bae05cf8674720cfd72c78840cd7a28919
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152256
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 5b42f148e206cda19467e76c2f9915fc2b6fa5f6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152219
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxml2/ExternalProject_libxml2.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libxml2/ExternalProject_libxml2.mk b/external/libxml2/ExternalProject_libxml2.mk index 7b334fa8ab2a..2fe0e6005724 100644 --- a/external/libxml2/ExternalProject_libxml2.mk +++ b/external/libxml2/ExternalProject_libxml2.mk @@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build): $(if $(SYSBASE),-I$(SYSBASE)/usr/include) \ $(call gb_ExternalProject_get_build_flags,libxml2)" \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ - && $(MAKE) libxml2.la \ + && $(MAKE) libxml2.la xmllint \ ) $(call gb_Trace_EndRange,libxml2,EXTERNAL) endif |