Splux Linux

source-based Linux using SPS

sps-core · log · files · refs · tags · releases · people · languages · GitHub · commit

37bfffb


readline: ship a shared library and link bash and less against it

Date
Commit37bfffb5a59e11bb1cf006392d6ff4d54f2b3a73
GitHubmirror

Parents

Stat

 base/bash/recipe     | 8 +++++---
 base/less/recipe     | 6 ++++--
 libs/readline/recipe | 9 +++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

Diff

diff --git a/base/bash/recipe b/base/bash/recipe
index cdd4e22..073095e 100644
--- a/base/bash/recipe
+++ b/base/bash/recipe
@@ -1,13 +1,15 @@
 name        bash
 version     5.3
-release     1
+release     2
 description GNU Bourne Again SHell
 
 source      https://ftp.gnu.org/gnu/bash/bash-${version}.tar.gz
 hash        sha256:0d5cd86965f869a26cf64f4b71be7b96f90a3ba8b3d74e27e8e9d9d5550f31ba
 
 depend      filesystem
+depend      readline
+depend      ncurses
 
-configure   ./configure --prefix=/usr --without-bash-malloc --with-curses
+configure   ./configure --prefix=/usr --without-bash-malloc --with-installed-readline --with-curses
 build       make -j"$MAKEJOBS"
-install     make install DESTDIR="$PKG" && ln -sfv bash "$PKG/usr/bin/sh"
+install     make install DESTDIR="$PKG" && ln -sf bash "$PKG/usr/bin/sh"
diff --git a/base/less/recipe b/base/less/recipe
index b91a6e2..716a72b 100644
--- a/base/less/recipe
+++ b/base/less/recipe
@@ -1,13 +1,15 @@
 name        less
 version     704
-release     1
+release     2
 description less: terminal pager for viewing text files
 
 source      https://www.greenwoodsoftware.com/less/less-${version}.tar.gz
 hash        sha256:20a0b0a2bb2525fa53c7eee9beb854b4c9cf172eabb209af7020743547bfe9fb
 
 depend      filesystem
+depend      ncurses
+depend      readline
 
-configure   ./configure --prefix=/usr --with-secure-sort
+configure   ./configure --prefix=/usr --with-secure-sort --with-readline
 build       make -j"$MAKEJOBS"
 install     make install DESTDIR="$PKG"
diff --git a/libs/readline/recipe b/libs/readline/recipe
index ad4f2f6..845343e 100644
--- a/libs/readline/recipe
+++ b/libs/readline/recipe
@@ -1,13 +1,14 @@
 name        readline
 version     8.3
-release     1
+release     2
 description GNU readline: line-editing and history library
 
 source      https://ftp.gnu.org/gnu/readline/readline-${version}.tar.gz
 hash        sha256:fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc
 
 depend      filesystem
+depend      ncurses
 
-configure   ./configure --prefix=/usr --disable-shared --enable-static
-build       make -j"$MAKEJOBS"
-install     make install DESTDIR="$PKG"
+configure   ./configure --prefix=/usr --disable-static --with-curses
+build       make -j"$MAKEJOBS" SHLIB_LIBS="-lncursesw"
+install     make SHLIB_LIBS="-lncursesw" install DESTDIR="$PKG"