diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2024-02-15 18:51:27 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2024-02-28 11:03:19 +0100 |
| commit | 821f06726337c0108c5620498621f3baa7344c7e (patch) | |
| tree | d23080b0014f8f1f94687800bdb40758e93518e3 | |
| parent | f75130dcf240f3fe0d11d4374e1ad4e36d92e416 (diff) | |
tdf#159502 libxml2: apply Solaris ld patch only on Solaris
Diverging from upstream by inventing a LIBXML2_GLOBAL_VARIABLES version
should only be done if actually required.
Change-Id: I1520ca5078dc24ffd83e927f9c857d625e71749b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163455
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit eebdda4e221327cae5a9177893394819ca510d5f)
| -rw-r--r-- | external/libxml2/UnpackedTarball_libxml2.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk b/external/libxml2/UnpackedTarball_libxml2.mk index d50d52cbeef8..489fb007572b 100644 --- a/external/libxml2/UnpackedTarball_libxml2.mk +++ b/external/libxml2/UnpackedTarball_libxml2.mk @@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libxml2,$(LIBXML_TARBALL),,libxml2) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libxml2)) $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\ - external/libxml2/libxml2-global-symbols.patch \ + $(if $(filter SOLARIS,$(OS)),external/libxml2/libxml2-global-symbols.patch) \ external/libxml2/libxml2-vc10.patch \ external/libxml2/libxml2-XMLCALL-redefine.patch.0 \ $(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \ |