diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-03-24 10:48:04 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2020-03-25 11:14:07 +0100 |
| commit | 924c12b546b94c3f928cf5a026a68c49e432bc4a (patch) | |
| tree | 615d73ed62f5636fce052156604a149f283541b4 /external/icu/ExternalProject_icu.mk | |
| parent | 452782faf0fff9c9da61f4841e07c8c89a550cc3 (diff) | |
icu: add patch to fix CVE-2020-10531
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90971
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 002d1152dc418f7d624409e76cd9d4ac0b42c7f8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90975
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 63b573faf984875cda7a879e696ea75fae81df57)
Change-Id: I0aca4af1bd79f28bf1c920a4d05e80948106aaac
Diffstat (limited to 'external/icu/ExternalProject_icu.mk')
| -rw-r--r-- | external/icu/ExternalProject_icu.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 1a9c5ff90602..6f99976871ad 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -13,7 +13,10 @@ $(eval $(call gb_ExternalProject_register_targets,icu,\ build \ )) -icu_CPPFLAGS:="-DHAVE_GCC_ATOMICS=$(if $(filter TRUE,$(GCC_HAVE_BUILTIN_ATOMIC)),1,0)" +# -I to find o3tl headers +icu_CPPFLAGS:=" \ + -DHAVE_GCC_ATOMICS=$(if $(filter TRUE,$(GCC_HAVE_BUILTIN_ATOMIC)),1,0) \ + -I$(SRCDIR)/include" ifeq ($(OS),WNT) |