Browse Source

fix python (#2067)

* fix python

* fix python

* fix libffi
Hoildkv 2 years ago
parent
commit
36919ea80e
2 changed files with 3 additions and 7 deletions
  1. 1 7
      packages/l/libffi/xmake.lua
  2. 2 0
      packages/p/python/xmake.lua

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

@@ -35,19 +35,13 @@ package("libffi")
 
 
     on_install("macosx", "linux", "bsd", "mingw", function (package)
     on_install("macosx", "linux", "bsd", "mingw", function (package)
         local configs = {"--disable-silent-rules", "--disable-dependency-tracking"}
         local configs = {"--disable-silent-rules", "--disable-dependency-tracking"}
+        table.insert(configs, "--libdir=" .. package:installdir("lib"):gsub("\\", "/"))
         table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
         table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
         table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
         table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
         if package:debug() then
         if package:debug() then
             table.insert(configs, "--enable-debug")
             table.insert(configs, "--enable-debug")
         end
         end
         import("package.tools.autoconf").install(package, configs)
         import("package.tools.autoconf").install(package, configs)
-        if package:is_plat("linux") and package:is_arch("x86_64") then
-            local lib64 = path.join(package:installdir(), "lib64")
-            if os.isdir(lib64) then
-                package:add("links", "ffi")
-                package:add("linkdirs", "lib64")
-            end
-        end
     end)
     end)
 
 
     on_test(function (package)
     on_test(function (package)

+ 2 - 0
packages/p/python/xmake.lua

@@ -124,6 +124,8 @@ package("python")
 
 
         -- init configs
         -- init configs
         local configs = {"--enable-ipv6", "--with-ensurepip", "--enable-optimizations"}
         local configs = {"--enable-ipv6", "--with-ensurepip", "--enable-optimizations"}
+        table.insert(configs, "--libdir=" .. package:installdir("lib"))
+        table.insert(configs, "--with-platlibdir=lib")
         table.insert(configs, "--datadir=" .. package:installdir("share"))
         table.insert(configs, "--datadir=" .. package:installdir("share"))
         table.insert(configs, "--datarootdir=" .. package:installdir("share"))
         table.insert(configs, "--datarootdir=" .. package:installdir("share"))
         table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
         table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))