libedit: rename editline package (#5076)

* ncurses: fix widec config

* libedit: rename to editline

* fix find ncurses (hack
pull/5050/merge
star9029 3 months ago committed by GitHub
parent c8fb56cc91
commit e8e9c3380b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 19
      packages/l/libedit/xmake.lua
  2. 12
      packages/n/ncurses/xmake.lua

@ -1,4 +1,4 @@
package("editline") package("libedit")
set_homepage("http://thrysoee.dk/editline") set_homepage("http://thrysoee.dk/editline")
set_description("Autotool- and libtoolized port of the NetBSD Editline library (libedit).") set_description("Autotool- and libtoolized port of the NetBSD Editline library (libedit).")
set_license("BSD-3-Clause") set_license("BSD-3-Clause")
@ -7,7 +7,11 @@ package("editline")
add_versions("3.1", "5f0573349d77c4a48967191cdd6634dd7aa5f6398c6a57fe037cc02696d6099f") add_versions("3.1", "5f0573349d77c4a48967191cdd6634dd7aa5f6398c6a57fe037cc02696d6099f")
add_configs("terminal_db", {description = "Select terminal library", default = "termcap", type = "string", values = {"termcap", "ncurses", "tinfo"}}) add_configs("terminal_db", {description = "Select terminal library", default = "ncurses", type = "string", values = {"termcap", "ncurses", "tinfo"}})
if is_plat("linux") then
add_extsources("apt::libedit-dev")
end
add_includedirs("include", "include/editline") add_includedirs("include", "include/editline")
@ -29,7 +33,16 @@ package("editline")
local configs = {"--disable-examples"} local configs = {"--disable-examples"}
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"))
import("package.tools.autoconf").install(package, configs, {packagedeps = package:config("terminal_db")})
local terminal_db = package:config("terminal_db")
if terminal_db == "ncurses" then
local widec = package:dep("ncurses"):config("widec")
if widec then
-- hack
io.replace("configure", "-lncurses", "-lncursesw", {plain = true})
end
end
import("package.tools.autoconf").install(package, configs, {packagedeps = terminal_db})
end) end)
on_test(function (package) on_test(function (package)

@ -43,15 +43,15 @@ package("ncurses")
} }
table.insert(configs, "--with-debug=" .. (package:is_debug() and "yes" or "no")) table.insert(configs, "--with-debug=" .. (package:is_debug() and "yes" or "no"))
if package:config("widec") then table.insert(configs, "--with-shared=" .. (package:config("shared") and "yes" or "no"))
table.insert(configs, "--enable-widec") table.insert(configs, "--enable-widec=" .. (package:config("widec") and "yes" or "no"))
end
if package:config("shared") then
table.insert(configs, "--with-shared")
end
import("package.tools.autoconf").install(package, configs, {arflags = {"-curvU"}}) import("package.tools.autoconf").install(package, configs, {arflags = {"-curvU"}})
end) end)
on_test(function (package) on_test(function (package)
assert(package:has_cfuncs("initscr", {includes = "curses.h"})) assert(package:has_cfuncs("initscr", {includes = "curses.h"}))
end) end)
on_test(function (package)
assert(package:has_cfuncs("initscr", {includes = "curses.h"}))
end)

Loading…
Cancel
Save