stop supporting bash-1.x

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.

diff --git a/ChangeLog b/ChangeLog
index 60eefba7406f29f7b378c0d01abdf12892e0b5d1..a9cff1d80946343a2ff970e04936c69871357b62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/config.make.in b/config.make.in
index 4ca250d3bf38458292d93f1098f7ee8e9f90921c..416fb9ef6c5dd8bfba0c9122a1692bfa5691173c 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -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@

diff --git a/configure b/configure
index 1781860ab62004f3d596eae4f75714b822d8b16f..d4b5edb636312f675acafc0809ac4a4792ff4c27 100755 (executable)
--- a/configure
+++ b/configure
@@ -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

diff --git a/configure.ac b/configure.ac
index df3e177cdc2cea95475dd74196df3f4fac2316d3..43bd8a53031b1e4cb6d0fae8ad56282958b9d72c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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 &&

diff --git a/elf/Makefile b/elf/Makefile
index 8abc60b82178ebec479273ff4867fbbdb26e78db..df138fc2d8db4f455173ce83d2e1ce4f9b99d63b 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -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