diff --git a/packages/less/build.ncl b/packages/less/build.ncl index 460622f1..c7d1a3d1 100644 --- a/packages/less/build.ncl +++ b/packages/less/build.ncl @@ -1,18 +1,18 @@ -let { Attrs, BuildSpec, Local, OutputBin, OutputData, Source, .. } = import "minimal.ncl" in +let { Attrs, BuildSpec, Local, OutputBin, OutputData, OutputLib, Source, .. } = import "minimal.ncl" in let base = import "../base/build.ncl" in let make = import "../make/build.ncl" in let glibc = import "../glibc/build.ncl" in let ncurses = import "../ncurses/build.ncl" in let toolchain = import "../toolchain/build.ncl" in -let version = "692" in +let version = "704" in { name = "less", build_deps = [ { file = "build.sh" } | Local, { - # https://www.greenwoodsoftware.com/less/less-692.tar.gz + # https://www.greenwoodsoftware.com/less/less-704.tar.gz url = "gs://minimal-staging-archives/less-%{version}.tar.gz", - sha256 = "61300f603798ecf1d7786570789f0ff3f5a1acf075a6fb9f756837d166e37d14" + sha256 = "20a0b0a2bb2525fa53c7eee9beb854b4c9cf172eabb209af7020743547bfe9fb" } | Source, base, make, @@ -29,7 +29,19 @@ let version = "692" in outputs = { less = { glob = "usr/bin/less" } | OutputBin, - lessecho = { glob = "usr/bin/lessecho" } | OutputBin, + # lessecho MOVED in 704: upstream's Makefile.in installs it to + # ${libexecdir} where 692 installed it to ${bindir} — + # 692: ${INSTALL_PROGRAM} lessecho ${DESTDIR}${bindir}/lessecho + # 704: ${INSTALL_PROGRAM} lessecho ${DESTDIR}${libexecdir}/lessecho + # so with --prefix=/usr it lands in usr/libexec, and the old usr/bin glob + # matched nothing ("output globs did not match any files: lessecho"). + # + # Following upstream rather than forcing --libexecdir=/usr/bin: lessecho is + # an internal helper for LESSOPEN pipes, not a user-facing command, and 24 + # packages here already ship usr/libexec outputs while none override + # libexecdir. OutputLib matches findutils' `libexec_frcode`, the same shape + # — an executable helper that lives outside PATH. + lessecho = { glob = "usr/libexec/lessecho" } | OutputLib, lesskey = { glob = "usr/bin/lesskey" } | OutputBin, mans = { glob = "usr/share/man/**" } | OutputData, },