From 14963dc2dda4cd9725b18f499da9a01fbfe68221 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 | 3 --- Setup.hs | 4 ++++ accelerate.cabal | 56 ++++-------------------------------------------- cbits/tracy | 1 - 4 files changed, 8 insertions(+), 56 deletions(-) delete mode 160000 cbits/tracy diff --git a/.gitmodules b/.gitmodules index 0961c0de5..e69de29bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "cbits/tracy"] - path = cbits/tracy - url = https://github.com/wolfpld/tracy.git diff --git a/Setup.hs b/Setup.hs index fe3f33527..70f7bb7b7 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 af901494e..f3c863508 100644 --- a/accelerate.cabal +++ b/accelerate.cabal @@ -142,58 +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/cmake/*.cmake - cbits/tracy/capture/CMakeLists.txt - cbits/tracy/profiler/CMakeLists.txt - -- Used by the Tracy's client tools - cbits/tracy/capture/src/*.cpp - cbits/tracy/dtl/*.hpp - cbits/tracy/getopt/*.c - cbits/tracy/getopt/*.h - 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/profiler/*.cpp - cbits/tracy/profiler/src/profiler/*.h - cbits/tracy/profiler/src/profiler/*.hpp - 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/*.c - cbits/tracy/zstd/decompress/*.h - cbits/tracy/zstd/dictBuilder/*.c - cbits/tracy/zstd/dictBuilder/*.h extra-doc-files: images/*.png @@ -630,6 +578,10 @@ library cpp-options: -DACCELERATE_INTERNAL_CHECKS + -- Debug mode is disabled in this branch of Accelerate + 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 5d542dc09..000000000 --- a/cbits/tracy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5d542dc09f3d9378d005092a4ad446bd405f819a