Ver código fonte

fix libffi and update meson #pull/2085 (#2129)

ruki 2 anos atrás
pai
commit
b290a5915a
2 arquivos alterados com 5 adições e 0 exclusões
  1. 4 0
      packages/l/libffi/xmake.lua
  2. 1 0
      packages/m/meson/xmake.lua

+ 4 - 0
packages/l/libffi/xmake.lua

@@ -42,6 +42,10 @@ package("libffi")
             table.insert(configs, "--enable-debug")
         end
         import("package.tools.autoconf").install(package, configs)
+        -- @see https://github.com/xmake-io/xmake-repo/pull/2085#issuecomment-1567654930
+        if os.isdir(path.join(package:installdir(), "lib64")) then
+            package:add("linkdirs", "lib", "lib64")
+        end
     end)
 
     on_test(function (package)

+ 1 - 0
packages/m/meson/xmake.lua

@@ -6,6 +6,7 @@ package("meson")
 
     add_urls("https://github.com/mesonbuild/meson/releases/download/$(version)/meson-$(version).tar.gz",
              "https://github.com/mesonbuild/meson.git")
+    add_versions("1.1.1",  "d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c")
     add_versions("1.1.0",  "d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f")
     add_versions("1.0.0",  "aa50a4ba4557c25e7d48446abfde857957dcdf58385fffbe670ba0e8efacce05")
     add_versions("0.62.1", "a0f5caa1e70da12d5e63aa6a9504273759b891af36c8d87de381a4ed1380e845")