From 28c541773a4932e1088c161557f5b006bdc6c557 Mon Sep 17 00:00:00 2001 From: tb Date: Sun, 15 Mar 2026 17:12:01 +0000 Subject: [PATCH] spirv-tools: remove ports-gcc workaround tweaked diff from Brad --- graphics/spirv-tools/Makefile | 9 --------- .../spirv-tools/patches/patch-tools_CMakeLists_txt | 14 -------------- 2 files changed, 23 deletions(-) delete mode 100644 graphics/spirv-tools/patches/patch-tools_CMakeLists_txt diff --git a/graphics/spirv-tools/Makefile b/graphics/spirv-tools/Makefile index bad04ff78fe..8c71433b2f2 100644 --- a/graphics/spirv-tools/Makefile +++ b/graphics/spirv-tools/Makefile @@ -35,16 +35,7 @@ DPB_PROPERTIES = parallel CONFIGURE_ARGS = -DSPIRV-Headers_SOURCE_DIR="${LOCALBASE}" \ -DSPIRV_WERROR=OFF -SUBST_VARS += ADDITIONAL_LIBRARIES - -pre-configure: - ${SUBST_CMD} ${WRKSRC}/tools/CMakeLists.txt - # effcee is missing to build tests NO_TEST = Yes .include - -.if ${CHOSEN_COMPILER} == ports-gcc -ADDITIONAL_LIBRARIES = stdc++fs -.endif diff --git a/graphics/spirv-tools/patches/patch-tools_CMakeLists_txt b/graphics/spirv-tools/patches/patch-tools_CMakeLists_txt deleted file mode 100644 index 40a20452da7..00000000000 --- a/graphics/spirv-tools/patches/patch-tools_CMakeLists_txt +++ /dev/null @@ -1,14 +0,0 @@ -Add -lstdc++fs for ports-gcc - -Index: tools/CMakeLists.txt ---- tools/CMakeLists.txt.orig -+++ tools/CMakeLists.txt -@@ -86,7 +86,7 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES}) - util/cli_consumer.cpp - io.cpp - ${COMMON_TOOLS_SRCS} -- LIBS ${SPIRV_TOOLS_FULL_VISIBILITY}) -+ LIBS ${SPIRV_TOOLS_FULL_VISIBILITY} ${ADDITIONAL_LIBRARIES}) - target_include_directories(spirv-objdump PRIVATE ${spirv-tools_SOURCE_DIR} - ${SPIRV_HEADER_INCLUDE_DIR}) - set(SPIRV_INSTALL_TARGETS ${SPIRV_INSTALL_TARGETS} spirv-objdump)