media-gfx/mandelbulber: fix build when dev-cpp/ms-gsl is installed

By injecting -I/usr/include/gsl, `#include <algorithm>` starts to mean
"use ms-gsl's algorithm" rather than the C++ stdlib one. But all of the
includes for ms-gsl here are properly namespaced, e.g. <gsl/foo.h>, so
we can drop the explicit -I*.

Closes: https://bugs.gentoo.org/834692
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2025-04-15 23:02:51 +01:00
parent d79bab5ce8
commit 6e25dc1d7e
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
2 changed files with 22 additions and 0 deletions

View File

@ -0,0 +1,18 @@
https://bugs.gentoo.org/834692
https://github.com/buddhi1980/mandelbulber2/pull/972
https://github.com/microsoft/GSL/issues/466
By injecting -I/usr/include/gsl, `#include <algorithm>` starts to mean
"use ms-gsl's algorithm" rather than the C++ stdlib one. But all of the
includes for ms-gsl here are properly namespaced, e.g. <gsl/foo.h>, so
we can drop the explicit -I*.
--- a/makefiles/common.pri
+++ b/makefiles/common.pri
@@ -122,7 +122,6 @@ macx:DEFINES += "SHARED_DIR_IS_APP_DIR"
# test hardcoded lib path for gsl in travis container
#QMAKE_CXXFLAGS += -I/usr/include/gsl
-QMAKE_CXXFLAGS += -I/usr/include/gsl
m1:QMAKE_CXXFLAGS += -I/opt/homebrew/include
# library linking

View File

@ -41,6 +41,10 @@ DEPEND="${RDEPEND}
"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-2.33-gsl.patch
)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
}