From 225ab0a662139fe78e38c65b0d7748f390c809ff Mon Sep 17 00:00:00 2001 From: Tom Smeding Date: Wed, 30 Oct 2024 18:18:37 +0100 Subject: [PATCH] b3cc patch: remove tracy submodule to not confuse cabal The relevant cabal PR is https://github.com/haskell/cabal/pull/10190 , which is not yet included in any released cabal version. It will be in 3.14, presumably. --- .gitmodules | 7 ------ Setup.hs | 4 ++++ accelerate.cabal | 60 +++--------------------------------------------- cbits/tracy | 1 - 4 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 .gitmodules delete mode 160000 cbits/tracy diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 56d68671a..000000000 --- a/.gitmodules +++ /dev/null @@ -1,7 +0,0 @@ -# This is on a fork only for the following commit: -# https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a -# which fixes a dumb compile error. -# When tracy publishes something > v0.10, please upgrade to that instead. -[submodule "cbits/tracy"] - path = cbits/tracy - url = https://github.com/tomsmeding/tracy.git diff --git a/Setup.hs b/Setup.hs index f0f06bfb3..4285dfa9f 100755 --- a/Setup.hs +++ b/Setup.hs @@ -30,6 +30,10 @@ preConfHook args config_flags = do debugging = fromMaybe False $ lookupFlagAssignment (mkFlagName "debug") (configConfigurationsFlags config_flags) when debugging $ do + dieNoVerbosity $ "In this version of Accelerate, debug mode is disabled to \ + \prevent problems with cabal on Windows. The problems will\ + \be fixed in Cabal 3.14, which is not yet released." + yes <- doesFileExist "cbits/tracy/public/TracyClient.cpp" if yes then diff --git a/accelerate.cabal b/accelerate.cabal index 6a3c5e403..1735131d6 100644 --- a/accelerate.cabal +++ b/accelerate.cabal @@ -142,63 +142,6 @@ extra-source-files: cbits/xkcp/*.h cbits/xkcp/*.macros cbits/xkcp/*.inc - -- TRACY - -- These are referenced directly using the FFI - cbits/tracy/public/*.cpp - cbits/tracy/public/tracy/*.h - cbits/tracy/public/tracy/*.hpp - cbits/tracy/public/common/*.h - cbits/tracy/public/common/*.hpp - cbits/tracy/public/common/*.cpp - cbits/tracy/public/client/*.h - cbits/tracy/public/client/*.hpp - cbits/tracy/public/client/*.cpp - -- These are used to build Tracy's client tools in Setup.hs - cbits/tracy/capture/build/unix/Makefile - cbits/tracy/capture/build/unix/*.mk - cbits/tracy/profiler/build/unix/Makefile - cbits/tracy/profiler/build/unix/*.mk - cbits/tracy/common/*.mk - -- The Makefiles fetch the source files from these Visual Studio project files - cbits/tracy/capture/build/win32/capture.vcxproj - cbits/tracy/capture/build/win32/capture.vcxproj.filters - cbits/tracy/profiler/build/win32/Tracy.vcxproj - cbits/tracy/profiler/build/win32/Tracy.vcxproj.filters - -- Used by the Tracy's client tools - cbits/tracy/capture/src/*.cpp - cbits/tracy/dtl/*.hpp - cbits/tracy/imgui/*.cpp - cbits/tracy/imgui/*.h - cbits/tracy/imgui/misc/freetype/*.cpp - cbits/tracy/imgui/misc/freetype/*.h - cbits/tracy/nfd/*.cpp - cbits/tracy/nfd/*.h - cbits/tracy/nfd/*.m - cbits/tracy/profiler/src/*.cpp - cbits/tracy/profiler/src/*.c - cbits/tracy/profiler/src/*.h - cbits/tracy/profiler/src/*.hpp - cbits/tracy/profiler/src/font/*.hpp - cbits/tracy/profiler/src/imgui/*.cpp - cbits/tracy/profiler/src/imgui/*.h - cbits/tracy/profiler/src/wayland/*.c - cbits/tracy/profiler/src/wayland/*.h - cbits/tracy/public/libbacktrace/*.cpp - cbits/tracy/public/libbacktrace/*.h - cbits/tracy/public/libbacktrace/*.hpp - cbits/tracy/server/*.cpp - cbits/tracy/server/*.h - cbits/tracy/server/*.hpp - cbits/tracy/zstd/*.h - cbits/tracy/zstd/common/*.c - cbits/tracy/zstd/common/*.h - cbits/tracy/zstd/compress/*.c - cbits/tracy/zstd/compress/*.h - cbits/tracy/zstd/decompress/*.S - cbits/tracy/zstd/decompress/*.c - cbits/tracy/zstd/decompress/*.h - cbits/tracy/zstd/dictBuilder/*.c - cbits/tracy/zstd/dictBuilder/*.h extra-doc-files: images/*.png @@ -635,6 +578,9 @@ library cpp-options: -DACCELERATE_INTERNAL_CHECKS + if flag(debug) + buildable: False + if os(windows) cc-options: -- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65782 diff --git a/cbits/tracy b/cbits/tracy deleted file mode 160000 index 821ef62c1..000000000 --- a/cbits/tracy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 821ef62c1db9a11231bf216a30b1ebfaedfe2244