summaryrefslogtreecommitdiff
path: root/external/poppler
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-06-25 11:30:09 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-08-30 23:31:14 +0200
commit996370823a95084e8e867de7d79185fbef204b86 (patch)
tree8eb469a36af1c67f6047efb3e25c2bd956bcc163 /external/poppler
parent909c95921742e32c7064f887e5ed7f0c1c853ba6 (diff)
poppler: fix incorrect GCC_VERSION check
The minor version is encoded into the last 2 digits, the micro version is not avialable. Change-Id: I4eee40511d732ec8cfc8d85943b965bb6e06d66e Reviewed-on: https://gerrit.libreoffice.org/56380 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins (cherry picked from commit 16b10d9ac976d40daffee1d15456016f4a89cd2e) Reviewed-on: https://gerrit.libreoffice.org/56388 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 9c3a0c9e5f33d1a53afe76135739896dfa63fc2a)
Diffstat (limited to 'external/poppler')
-rw-r--r--external/poppler/StaticLibrary_poppler.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk
index da85aff3f710..fd7f5c467973 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -34,11 +34,12 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
endif
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864
+# can't easily check for 4.8.2 exactly so just apply to GCC 4.8.x
ifeq ($(COM),GCC)
ifeq ($(COM_IS_CLANG),)
ifeq ($(CPUNAME),INTEL)
-ifeq ($(shell expr '$(GCC_VERSION)' '<' 483),1)
-ifeq ($(shell expr '$(GCC_VERSION)' '>=' 480),1)
+ifeq ($(shell expr '$(GCC_VERSION)' '<' 409),1)
+ifeq ($(shell expr '$(GCC_VERSION)' '>=' 408),1)
$(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
-march=i586 \
))