From cc623b63b4420b4d72011f4bb3b466326c24898b Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Thu, 31 Mar 2022 05:58:43 +0200 Subject: [PATCH] graphics/poppler: ignore graphics/openjpeg15 presence - cmake can under some non-determinstic circumstances find the OpenJPEGConfig.cmake in ${PREFIX}/lib/openjpeg-1.5 prior to the one in ${PREFIX}/lib/openjpeg2 with would be the wanted one. - Use CMAKE_IGNORE_PATH to explicitely make it not see that prefix. https://cmake.org/cmake/help/latest/variable/CMAKE_IGNORE_PATH.html#variable:CMAKE_IGNORE_PATH PR: 262888 --- graphics/poppler/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index ea57d64e88bd..b13c08e85ac6 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -34,6 +34,11 @@ CMAKE_ON= ENABLE_LIBJPEG \ ENABLE_NSS \ ENABLE_SPLASH CMAKE_OFF= BUILD_GTK_TESTS +# Ensure that path ordering does not lead to openjpeg15 being found and picked +# instead of openjpeg2 on systems that have both installed +# Note: since f3ba77e14cac05d43caf35100848eeaee3bc64b4 graphics/openjpeg15 installs +# its cmake files to ${PREFIX}/lib/openjpeg15 +CMAKE_ARGS+= -DCMAKE_IGNORE_PATH:PATH=${PREFIX}/lib/openjpeg-1.5 # Slave ports. _POPPLER_SLAVES= library glib qt5 utils -- 2.35.1