diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | config.make.in | 2 | ||||
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | elf/Makefile | 23 |
5 files changed, 20 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog index 60eefba740..a9cff1d809 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 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. (KSH): Delete. * configure.ac (libc_cv_have_ksh): Delete. diff --git a/config.make.in b/config.make.in index 4ca250d3bf..416fb9ef6c 100644 --- 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 1781860ab6..d4b5edb636 100755 --- 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 df3e177cdc..43bd8a5303 100644 --- 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 8abc60b821..df138fc2d8 100644 --- 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 |