diff options
| author |   Sam James <sam@gentoo.org> | 2021-05-13 15:55:08 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2021-05-13 15:55:08 +0200 |
| commit | 137cdb5311f615f0c72bab5d9304a38612239f49 (patch) | |
| tree | 773e6926e05639eb7798a30d5e397c514982a01d /app-shells/bash/bash-3.0_p22.ebuild | |
| parent | app-arch/unrar: drop unused flag-o-matic inherit (diff) | |
| download | gentoo-137cdb5311f615f0c72bab5d9304a38612239f49.tar.gz gentoo-137cdb5311f615f0c72bab5d9304a38612239f49.tar.bz2 gentoo-137cdb5311f615f0c72bab5d9304a38612239f49.zip | |
app-shells/bash: drop unused multilib inherit, tidy up ebuild
* Drop unused multilib inherit
* Move lost/orphaned ncurses comment to its rightful place
* Normalise bug references
* Add whitespace to aid readability
Closes: https://github.com/gentoo/gentoo/pull/20538
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-shells/bash/bash-3.0_p22.ebuild')
| -rw-r--r-- | app-shells/bash/bash-3.0_p22.ebuild | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild index 9cb8f4f7c86e..1b23a376b371 100644 --- a/app-shells/bash/bash-3.0_p22.ebuild +++ b/app-shells/bash/bash-3.0_p22.ebuild @@ -46,22 +46,25 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}"/autoconf-mktime-2.53.patch #220040 + "${FILESDIR}"/autoconf-mktime-2.53.patch "${FILESDIR}"/${PN}-3.0-protos.patch - "${FILESDIR}"/${PN}-3.0-rbash.patch #26854 - "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002 - "${FILESDIR}"/${PN}-3.0-darwin-conn.patch #79124 - # read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream + "${FILESDIR}"/${PN}-3.0-rbash.patch # bug #26854 + "${FILESDIR}"/${PN}-2.05b-parallel-build.patch # bug #41002 + "${FILESDIR}"/${PN}-3.0-darwin-conn.patch # bug #79124 + + # Read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream "${FILESDIR}"/${PN}-3.0-{afs,crash,jobs,manpage,pwd,ulimit,histtimeformat,locale,multibyteifs,subshell,volatile-command}.patch - "${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch #87093 + + "${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch # bug #87093 "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch - "${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349 + "${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch # bug #92349 "${FILESDIR}"/${PN}-3.0-strnlen.patch - "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850 + "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch # bug #431850 ) pkg_setup() { - if is-flag -malign-double ; then #7332 + # bug #7332 + if is-flag -malign-double ; then eerror "Detected bad CFLAGS '-malign-double'. Do not use this" eerror "as it breaks LFS (struct stat64) on x86." die "remove -malign-double from your CFLAGS mr ricer" @@ -87,7 +90,13 @@ src_prepare() { src_configure() { local myconf=( --with-installed-readline=. + + # Force linking with system curses ... the bundled termcap lib + # sucks bad compared to ncurses. For the most part, ncurses + # is here because readline needs it. But bash itself calls + # ncurses in one or two small places :(. --with-curses + $(use_with afs) $(use_enable net net-redirections) --disable-profiling @@ -124,12 +133,9 @@ src_configure() { # is at least what's in the DEPEND up above. export ac_cv_rl_version=6.2 - # Force linking with system curses ... the bundled termcap lib - # sucks bad compared to ncurses. For the most part, ncurses - # is here because readline needs it. But bash itself calls - # ncurses in one or two small places :(. + # bug #444070 + tc-export AR - tc-export AR #444070 econf "${myconf[@]}" } |