poppler: fix incorrect GCC_VERSION check

Desktop / LibreOffice - Michael Stahl [cib.de] - 25 June 2018 11:00 EDT

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

###

diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk
index 08bc66eeadbd..f145b7ae9c39 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 \
))

16b10d9ac976 poppler: fix incorrect GCC_VERSION check
external/poppler/StaticLibrary_poppler.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Upstream: cgit.freedesktop.org


  • Share