|
@@ -109,8 +109,7 @@ package("openssl")
|
|
table.insert(configs, "--debug")
|
|
table.insert(configs, "--debug")
|
|
end
|
|
end
|
|
os.vrunv("./config", configs, {envs = buildenvs})
|
|
os.vrunv("./config", configs, {envs = buildenvs})
|
|
- local makeconfigs = {CFLAGS = buildenvs.CFLAGS, ASFLAGS = buildenvs.ASFLAGS}
|
|
|
|
- import("package.tools.make").build(package, makeconfigs)
|
|
|
|
|
|
+ import("package.tools.make").build(package)
|
|
import("package.tools.make").make(package, {"install_sw"})
|
|
import("package.tools.make").make(package, {"install_sw"})
|
|
if package:config("shared") then
|
|
if package:config("shared") then
|
|
os.tryrm(path.join(package:installdir("lib"), "*.a"))
|
|
os.tryrm(path.join(package:installdir("lib"), "*.a"))
|
|
@@ -147,8 +146,7 @@ package("openssl")
|
|
"--prefix=" .. package:installdir()}
|
|
"--prefix=" .. package:installdir()}
|
|
local buildenvs = import("package.tools.autoconf").buildenvs(package)
|
|
local buildenvs = import("package.tools.autoconf").buildenvs(package)
|
|
os.vrunv("./Configure", configs, {envs = buildenvs})
|
|
os.vrunv("./Configure", configs, {envs = buildenvs})
|
|
- local makeconfigs = {CFLAGS = buildenvs.CFLAGS, ASFLAGS = buildenvs.ASFLAGS}
|
|
|
|
- import("package.tools.make").build(package, makeconfigs)
|
|
|
|
|
|
+ import("package.tools.make").build(package)
|
|
import("package.tools.make").make(package, {"install_sw"})
|
|
import("package.tools.make").make(package, {"install_sw"})
|
|
end)
|
|
end)
|
|
|
|
|