mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

stop supporting bash-1.x

Browse Source 
We've stopped supporting toolchain packages older than 2009, so punting
bash-1.x is reasonable when bash-2 was released almost 20 years ago.
This commit is contained in:
Mike Frysinger 2014-01-25 00:44:37 -05:00
parent c66e48b4a7
commit 43ca83ecc4
5 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2014-03-13 Mike Frysinger <vapier@gentoo.org>
* config.make.in (have-bash2): Delete.
* configure.ac (libc_cv_have_bash2): Delete.
* configure: Regenerate.
* elf/Makefile (common-ldd-rewrite): Rename to ...
(ldd-rewrite): ... this. Move bash-ldd-rewrite content to end.
(sh-ldd-rewrite): Delete.
(bash-ldd-rewrite): Delete.
(have-bash2): Delete checks.
[ldd-rewrite-script]: Change $(ldd-shell)-ldd-rewrite to ldd-rewrite.
2014-03-13 Mike Frysinger <vapier@gentoo.org>
* config.make.in (have-ksh): Delete.

2
config.make.in
View File

@ -73,8 +73,6 @@ multi-arch = @multi_arch@
mach-interface-list = @mach_interface_list@
have-bash2 = @libc_cv_have_bash2@
sizeof-long-double = @sizeof_long_double@
nss-crypt = @libc_cv_nss_crypt@

9
configure vendored
View File

@ -616,7 +616,6 @@ libc_cv_cc_with_libunwind
BISON
INSTALL_INFO
PERL
libc_cv_have_bash2
BASH_SHELL
libc_cv_gcc_static_libgcc
CXX_SYSINCLUDES
@ -5318,14 +5317,6 @@ $as_echo "no" >&6; }
fi
if test "$BASH_SHELL" != no &&
$BASH_SHELL -c 'test "$BASH_VERSINFO" \
&& test "$BASH_VERSINFO" -ge 2 >&/dev/null'; then
libc_cv_have_bash2=yes
else
libc_cv_have_bash2=no
fi
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2

8
configure.ac
View File

@ -1099,14 +1099,6 @@ fi])
AC_SUBST(libc_cv_gcc_static_libgcc)
AC_PATH_PROG(BASH_SHELL, bash, no)
if test "$BASH_SHELL" != no &&
$BASH_SHELL -c 'test "$BASH_VERSINFO" \
&& test "$BASH_VERSINFO" -ge 2 >&/dev/null'; then
libc_cv_have_bash2=yes
else
libc_cv_have_bash2=no
fi
AC_SUBST(libc_cv_have_bash2)
AC_PATH_PROG(PERL, perl, no)
if test "$PERL" != no &&

23
elf/Makefile
View File

@ -397,27 +397,20 @@ ldso_install: $(inst_rtlddir)/$(rtld-installed-name)
endif
common-ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
-e 's%@VERSION@%$(version)%g' \
-e 's|@PKGVERSION@|$(PKGVERSION)|g' \
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g'
sh-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%/bin/sh%g;s/\$$"/"/g'
bash-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%$(BASH)%g' \
-e 's%@TEXTDOMAINDIR@%$(msgcatdir)%g'
ifneq ($(have-bash2),yes)
ldd-shell = sh
else
ldd-shell = bash
endif
ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
-e 's%@VERSION@%$(version)%g' \
-e 's|@PKGVERSION@|$(PKGVERSION)|g' \
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \
-e 's%@BASH@%$(BASH)%g' \
-e 's%@TEXTDOMAINDIR@%$(msgcatdir)%g'
ifeq ($(ldd-rewrite-script),no)
define gen-ldd
LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< > $@.new
LC_ALL=C sed $(ldd-rewrite) < $< > $@.new
endef
else
define gen-ldd
LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< \
LC_ALL=C sed $(ldd-rewrite) < $< \
| LC_ALL=C sed -f $(patsubst $(..)/%,/%,$(..)$(ldd-rewrite-script)) > $@.new
endef
endif