From 09b26b4ebf56c2f6660ebdc07c7f61416d650017 Mon Sep 17 00:00:00 2001 From: Andrew Tribick Date: Sat, 8 Aug 2026 06:54:36 +0200 Subject: [PATCH] Avoid building dependent ports of FLTK on x64-linux (#53144) --- scripts/ci.feature.baseline.txt | 2 ++ scripts/test_ports/vcpkg-ci-mathgl/vcpkg.json | 5 ++++- scripts/test_ports/vcpkg-ci-octave/vcpkg.json | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 553b92bbc1..784774c593 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -744,6 +744,7 @@ mapnik[viewer]:arm64-linux=cascade materialx[render]:arm64-linux=feature-fails mathgl[arma]:arm64-linux=cascade mathgl[fltk]:arm64-linux=cascade +mathgl[fltk]:x64-linux=skip # Xft linking issue https://github.com/microsoft/vcpkg/issues/52825 mathgl[glut]:arm64-linux=cascade mathgl[hdf5,qt5]:arm64-windows=cascade mathgl[opengl]:arm64-linux=feature-fails @@ -823,6 +824,7 @@ nvtt[cuda]:x86-windows=cascade nvtt[cuda](x64 & (linux | windows))=feature-fails # nvtt getting dated wrt cuda octave:arm64-linux=fail octave:arm64-osx=fail # blas must select openblas instead of Accelerate +octave[fltk]:x64-linux=skip # Xft linking issue https://github.com/microsoft/vcpkg/issues/52825 octave(android)=skip ode:arm64-windows=fail ogdf:arm64-linux=fail diff --git a/scripts/test_ports/vcpkg-ci-mathgl/vcpkg.json b/scripts/test_ports/vcpkg-ci-mathgl/vcpkg.json index a7976a1612..43348035fe 100644 --- a/scripts/test_ports/vcpkg-ci-mathgl/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-mathgl/vcpkg.json @@ -9,7 +9,10 @@ "features": [ "arma", "examples", - "fltk", + { + "name": "fltk", + "platform": "!(x64 & linux)" + }, "gif", "glut", "gsl", diff --git a/scripts/test_ports/vcpkg-ci-octave/vcpkg.json b/scripts/test_ports/vcpkg-ci-octave/vcpkg.json index 1bf4ba97f6..5a2bfb55db 100644 --- a/scripts/test_ports/vcpkg-ci-octave/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-octave/vcpkg.json @@ -15,7 +15,10 @@ "colamd", "curl", "cxsparse", - "fltk", + { + "name": "fltk", + "platform": "!(x64 & linux)" + }, "fontconfig", "freetype", "graphicsmagick",