Selaa lähdekoodia

fix(libvpx): fix fedora build error

冰雪殇璃陌梦 2 vuotta sitten
vanhempi
commit
81b7a4c81c
2 muutettua tiedostoa jossa 8 lisäystä ja 2 poistoa
  1. 7 1
      packages/l/libvpx/xmake.lua
  2. 1 1
      packages/s/svt-av1/xmake.lua

+ 7 - 1
packages/l/libvpx/xmake.lua

@@ -32,11 +32,17 @@ package("libvpx")
 
     on_load(function (package)
         if package:is_targetarch("x64", "x86_64") then
-            if package:is_plat("freebsd") or (os.is_host("linux") and linuxos.name == "fedora") then
+            if package:is_plat("freebsd") then
                 package:add("deps", "nasm")
             else
                 package:add("deps", "yasm")
             end
+            if (os.is_host("linux") and linuxos.name() == "fedora") then
+                -- configure script uses which to detect yasm
+                cprint("${blue}installing which...${clear}")
+                os.run("dnf install which -y")
+                cprint("${green}done${clear}")
+            end
         end
     end)
 

+ 1 - 1
packages/s/svt-av1/xmake.lua

@@ -17,7 +17,7 @@ package("svt-av1")
 
     on_load(function (package)
         if package:is_targetarch("x64", "x86_64") then
-            if is_host("windows") or package:is_plat("freebsd") or (os:is_host("linux") and linuxos.name() == "fedora") then
+            if is_host("windows") or package:is_plat("freebsd") then
                 package:add("deps", "nasm")
             else
                 package:add("deps", "yasm")