diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2014-01-25 00:44:37 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-03-13 20:20:12 -0400 |
| commit | 43ca83ecc482f34e002d5f0accfb4a7cef471e4a (patch) | |
| tree | b6b086dc7c9a6f1e3542ce4f33d407d80dcf73ff /elf | |
| parent | c66e48b4a704ab20c0a9e04e9237c62b9b5aedae (diff) | |
| download | glibc-43ca83ecc482f34e002d5f0accfb4a7cef471e4a.tar glibc-43ca83ecc482f34e002d5f0accfb4a7cef471e4a.tar.gz glibc-43ca83ecc482f34e002d5f0accfb4a7cef471e4a.tar.bz2 glibc-43ca83ecc482f34e002d5f0accfb4a7cef471e4a.zip | |
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.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 23 |
1 files changed, 8 insertions, 15 deletions
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 |