Преглед на файлове

fix libffi with correct flag (#2130)

Hoildkv преди 2 години
родител
ревизия
70656b765e
променени са 2 файла, в които са добавени 5 реда и са изтрити 6 реда
  1. 2 6
      packages/l/libffi/xmake.lua
  2. 3 0
      packages/n/ncurses/xmake.lua

+ 2 - 6
packages/l/libffi/xmake.lua

@@ -34,18 +34,14 @@ package("libffi")
     end)
 
     on_install("macosx", "linux", "bsd", "mingw", function (package)
-        local configs = {"--disable-silent-rules", "--disable-dependency-tracking"}
-        table.insert(configs, "--libdir=" .. package:installdir("lib"):gsub("\\", "/"))
+        -- https://github.com/libffi/libffi/issues/127
+        local configs = {"--disable-silent-rules", "--disable-dependency-tracking", "--disable-multi-os-directory"}
         table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
         table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
         if package:debug() then
             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)

+ 3 - 0
packages/n/ncurses/xmake.lua

@@ -14,6 +14,9 @@ package("ncurses")
 
     add_configs("widec", {description = "Compile with wide-char/UTF-8 code.", default = true, type = "boolean"})
 
+    if is_plat("linux") then
+        add_extsources("apt::libncurses-dev")
+    end
     on_load(function (package)
         if package:config("widec") then
             package:add("links", "ncursesw", "formw", "panelw", "menuw")