diff options
Diffstat (limited to 'internal/rosa/package/muon')
| -rw-r--r-- | internal/rosa/package/muon/package.az | 11 | ||||
| -rw-r--r-- | internal/rosa/package/muon/remove-cl.patch | 39 |
2 files changed, 4 insertions, 46 deletions
diff --git a/internal/rosa/package/muon/package.az b/internal/rosa/package/muon/package.az index 588a4c8d..19e1b120 100644 --- a/internal/rosa/package/muon/package.az +++ b/internal/rosa/package/muon/package.az @@ -3,11 +3,11 @@ package meson-tests { website = "https://github.com/muon-build/meson-tests"; exclude = true; - version# = "38483b8cf5eb4f6e9df7a78d786ec111e0d6eb5d"; + version# = "fc9f5953819851cbd63d25c9ed9d521a90473fd2"; output = remoteTar { url = "https://github.com/muon-build/meson-tests/archive/"+ version+".tar.gz"; - checksum = "ikrJiczlObaLUMHRbzzWmGgAyZMymxxC3D9VFozD0sV3e5ckiHXk8qk0Zr8bBWvO"; + checksum = "6IblifjfYzbc7EW4TMb9krK5E8dZ9TU40UHa0Xa4mhlAPtCpYkmVNmRH6U0U17lf"; compress = gzip; }; patches = [ "remove-broken-tests.patch" ]; @@ -18,16 +18,13 @@ package muon { website = "https://muon.build"; anitya = 391173; - version# = "0.7.0"; + version# = "0.7.1"; source = remoteTar { url = "https://git.sr.ht/~lattis/muon/archive/"+version+".tar.gz"; - checksum = "ackLkMhxutd7xvLAVU25qkM5CAztLaYf1dAC2vIvlRIZ8o6LjaNpH-3OyP1xGQTO"; + checksum = "aSsUxrcopKSSsv-3NiDaZbYvbFMI2dvpPLHBn06IYZRvvsH62oakZ341gEWhUmTC"; compress = gzip; }; patches = [ - // for some reason, muon decides to use clang-cl on Rosa OS - "remove-cl.patch", - // equivalent to the meson patches "respect-colour.patch", diff --git a/internal/rosa/package/muon/remove-cl.patch b/internal/rosa/package/muon/remove-cl.patch deleted file mode 100644 index e421c25d..00000000 --- a/internal/rosa/package/muon/remove-cl.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/script/runtime/toolchains.meson b/src/script/runtime/toolchains.meson -index 97682251..bb49b041 100644 ---- a/src/script/runtime/toolchains.meson -+++ b/src/script/runtime/toolchains.meson -@@ -1059,22 +1059,6 @@ toolchain.register_compiler( - }, - ) - --toolchain.register_compiler( -- 'clang-cl', -- exe: {'c': 'clang-cl', 'cpp': 'clang-cl'}, -- inherit: 'msvc', -- linker: 'lld-link', -- archiver: 'llvm-lib', -- detect: func(out str) -> int -- return 'CL.EXE COMPATIBILITY' in out ? 100 : 0 -- endfunc, -- handlers: { -- 'force_language': func(_c compiler, s str) -> list[str] -- return ['-x', s] -- endfunc, -- }, --) -- - toolchain.register_compiler( - 'nasm', - exe: {'nasm': 'nasm'}, -diff --git a/src/vsenv.c b/src/vsenv.c -index f55541ec..c92e665a 100644 ---- a/src/vsenv.c -+++ b/src/vsenv.c -@@ -73,7 +73,6 @@ vsenv_setup(struct workspace *wk, const char *cache_path, enum setup_platform_en - "cc", - "gcc", - "clang", -- "clang-cl", - }; - uint32_t i; - for (i = 0; i < ARRAY_LEN(comps); ++i) { |
