From 82b95e16a8ec608dc65f68bab545271999f21495 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Thu, 24 Jan 2019 17:41:47 -0300 Subject: [PATCH] recipes: shells/bash: upgraded to version 5.0 --- recipes/shells/bash/recipe | 12 +++++++----- sources/SOURCELIST.txt | 2 +- sources/bash-4.4.tar.gz.sha256 | 1 - sources/bash-5.0.tar.gz.sha256 | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 sources/bash-4.4.tar.gz.sha256 create mode 100644 sources/bash-5.0.tar.gz.sha256 diff --git a/recipes/shells/bash/recipe b/recipes/shells/bash/recipe index 9c27654d..e2c33e18 100644 --- a/recipes/shells/bash/recipe +++ b/recipes/shells/bash/recipe @@ -1,6 +1,6 @@ # Build recipe for GNU bash. # -# Copyright (c) 2016-2018 Matias Fonzo, . +# Copyright (c) 2016-2019 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,8 +15,8 @@ # limitations under the License. program=bash -version=4.4 -release=2 +version=5.0 +release=1 # Set 'outdir' for a nice and well-organized output directory outdir="${outdir}/${arch}/shells" @@ -55,7 +55,7 @@ build() chmod -R u+w,go-w,a+rX-s . # Apply patches from upstream - for file in "${worktree}"/patches/bash/bash44-???* + for file in "${worktree}"/patches/bash/bash50-???* do if test -f "$file" then @@ -64,14 +64,16 @@ build() done ./configure CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ + LIBS="-lncursesw" \ $configure_args \ --libdir=/usr/lib${libSuffix} \ --infodir=$infodir \ --mandir=$mandir \ --docdir=$docsdir \ --enable-static-link \ - --with-installed-readline \ + --enable-multibyte \ --with-curses \ + --with-installed-readline \ --without-bash-malloc \ --build="$(cc -dumpmachine)" diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt index 57bc80c3..0d6edad7 100644 --- a/sources/SOURCELIST.txt +++ b/sources/SOURCELIST.txt @@ -8,7 +8,7 @@ ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.42.tar.bz2 ftp://ftp.freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.bz2 ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-2018.04.16-0.tar.bz2 ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz -ftp://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz +ftp://ftp.gnu.org/gnu/bash/bash-5.0.tar.gz ftp://ftp.gnu.org/gnu/gawk/gawk-4.2.1.tar.lz ftp://ftp.gnu.org/gnu/gdbm/gdbm-1.18.1.tar.gz ftp://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.lz diff --git a/sources/bash-4.4.tar.gz.sha256 b/sources/bash-4.4.tar.gz.sha256 deleted file mode 100644 index 18cf7625..00000000 --- a/sources/bash-4.4.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb bash-4.4.tar.gz diff --git a/sources/bash-5.0.tar.gz.sha256 b/sources/bash-5.0.tar.gz.sha256 new file mode 100644 index 00000000..b96e524f --- /dev/null +++ b/sources/bash-5.0.tar.gz.sha256 @@ -0,0 +1 @@ +b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d bash-5.0.tar.gz -- 2.11.4.GIT