wok-next diff bash/receipt @ rev 21468

updated tcpreplay (4.2.6 -> 4.3.2)
author Hans-G?nter Theisgen
date Wed May 13 06:25:58 2020 +0100 (2020-05-13)
parents e19ff076dc63
children
line diff
     1.1 --- a/bash/receipt	Mon Dec 31 17:23:40 2018 +0200
     1.2 +++ b/bash/receipt	Wed May 13 06:25:58 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="bash"
     1.7 -VERSION="4.4.p23"
     1.8 +VERSION="4.4.p23" # update stuff/patches/series too
     1.9  BASEVERSION="${VERSION%.*}"
    1.10  CATEGORY="shells"
    1.11  SHORT_DESC="The GNU bourne shell"
    1.12 @@ -12,6 +12,7 @@
    1.13  
    1.14  TARBALL="$PACKAGE-$BASEVERSION.tar.gz"
    1.15  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    1.16 +TARBALL_SHA1="8de012df1e4f3e91f571c3eb8ec45b43d7c747eb"
    1.17  
    1.18  BASHCHECKURL="https://raw.githubusercontent.com/hannob/bashcheck/master/bashcheck"
    1.19  BASHCHECK="$(basename $BASHCHECKURL)"
    1.20 @@ -21,45 +22,35 @@
    1.21  BUILD_DEPENDS="ncurses-dev readline-dev texinfo gettext-dev patch"
    1.22  SPLIT="$PACKAGE-dev"
    1.23  
    1.24 +DEPENDS_std="ncurses readline"
    1.25 +TAGS_std="LFS shell"
    1.26 +
    1.27  COOKOPTS="force-arch" # different config.h, .inc, .pc
    1.28  
    1.29 -patch_bash() {
    1.30 -	for i in $BASHPATCHES; do
    1.31 -		[ -s "$SRC/$i" ] ||
    1.32 -			wget -O "$SRC/$i" \
    1.33 -			http://ftp.gnu.org/gnu/bash/bash-$BASEVERSION-patches/$i
    1.34 -		echo "Apply $i patch..."
    1.35 -		patch -p0 -i $SRC/$i | awk '{print "  * " $0;}'
    1.36 -	done
    1.37 -}
    1.38 -
    1.39  cook_tmp_toolchain() {
    1.40  	cd $src
    1.41 -	patch_bash
    1.42 +	patchit
    1.43  	./configure --without-bash-malloc &&
    1.44  	make &&
    1.45  	make install
    1.46  }
    1.47  
    1.48  compile_rules() {
    1.49 -	# Patch and then build.
    1.50 -	patch_bash
    1.51 -
    1.52  	# Skip tests that can not run while cross-compiling.
    1.53 -	cat > config.cache <<EOF
    1.54 -ac_cv_func_mmap_fixed_mapped=yes
    1.55 -ac_cv_func_strcoll_works=yes
    1.56 -ac_cv_func_working_mktime=yes
    1.57 -bash_cv_func_sigsetjmp=present
    1.58 -bash_cv_getcwd_malloc=yes
    1.59 -bash_cv_job_control_missing=present
    1.60 -bash_cv_printf_a_format=yes
    1.61 -bash_cv_sys_named_pipes=present
    1.62 -bash_cv_ulimit_maxfds=yes
    1.63 -bash_cv_under_sys_siglist=yes
    1.64 -bash_cv_unusable_rtsigs=no
    1.65 -gt_cv_int_divbyzero_sigfpe=yes
    1.66 -EOF
    1.67 +	cat > config.cache <<-EOF
    1.68 +		ac_cv_func_mmap_fixed_mapped=yes
    1.69 +		ac_cv_func_strcoll_works=yes
    1.70 +		ac_cv_func_working_mktime=yes
    1.71 +		bash_cv_func_sigsetjmp=present
    1.72 +		bash_cv_getcwd_malloc=yes
    1.73 +		bash_cv_job_control_missing=present
    1.74 +		bash_cv_printf_a_format=yes
    1.75 +		bash_cv_sys_named_pipes=present
    1.76 +		bash_cv_ulimit_maxfds=yes
    1.77 +		bash_cv_under_sys_siglist=yes
    1.78 +		bash_cv_unusable_rtsigs=no
    1.79 +		gt_cv_int_divbyzero_sigfpe=yes
    1.80 +	EOF
    1.81  
    1.82  	./configure \
    1.83  		--cache-file=config.cache \
    1.84 @@ -91,18 +82,6 @@
    1.85  	:
    1.86  }
    1.87  
    1.88 -genpkg_rules() {
    1.89 -	case $PACKAGE in
    1.90 -		bash)
    1.91 -			copy @std
    1.92 -			DEPENDS="ncurses readline"
    1.93 -			TAGS="LFS shell"
    1.94 -			;;
    1.95 -		*-dev) copy @dev;;
    1.96 -	esac
    1.97 -}
    1.98 -
    1.99 -
   1.100  post_install_bash() {
   1.101  	mkdir -p "$1/etc/skel"; cp -a "$1/etc/bashrc" "$1/etc/skel/.bashrc"
   1.102