| 1 |
commit: da1fee13a6026c0f6a5cd9d4c0d95ef6abe7a554 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 26 22:57:37 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 26 22:57:37 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1fee13 |
| 7 |
|
| 8 |
sys-libs/readline: tidy up a little bit |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/readline/readline-8.2_rc3.ebuild | 39 +++++++++++++++++-------------- |
| 13 |
sys-libs/readline/readline-9999.ebuild | 39 +++++++++++++++++-------------- |
| 14 |
2 files changed, 44 insertions(+), 34 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/readline/readline-8.2_rc3.ebuild b/sys-libs/readline/readline-8.2_rc3.ebuild |
| 17 |
index 6ab39201ac56..4bc9fb0d90a8 100644 |
| 18 |
--- a/sys-libs/readline/readline-8.2_rc3.ebuild |
| 19 |
+++ b/sys-libs/readline/readline-8.2_rc3.ebuild |
| 20 |
@@ -86,7 +86,7 @@ S="${WORKDIR}/${MY_P}" |
| 21 |
|
| 22 |
PATCHES=( |
| 23 |
"${FILESDIR}"/${PN}-5.0-no_rpath.patch |
| 24 |
- "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 |
| 25 |
+ "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch # bug #385091 |
| 26 |
"${FILESDIR}"/${PN}-7.0-headers.patch |
| 27 |
"${FILESDIR}"/${PN}-8.0-headers.patch |
| 28 |
|
| 29 |
@@ -125,8 +125,8 @@ src_prepare() { |
| 30 |
ncurses_libs+=" -ltinfo${ncurses_libs_suffix}" |
| 31 |
fi |
| 32 |
else |
| 33 |
- # Force ncurses linking. #71420 |
| 34 |
- # Use pkg-config to get the right values. #457558 |
| 35 |
+ # Force ncurses linking, bug #71420. |
| 36 |
+ # Use pkg-config to get the right values, bug #457558. |
| 37 |
local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs) |
| 38 |
fi |
| 39 |
|
| 40 |
@@ -137,21 +137,22 @@ src_prepare() { |
| 41 |
-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ |
| 42 |
examples/rlfe/configure || die |
| 43 |
|
| 44 |
- # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated |
| 45 |
+ # Fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated |
| 46 |
# objformat for years, so we don't want to rely on that. |
| 47 |
sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die |
| 48 |
|
| 49 |
- ln -s ../.. examples/rlfe/readline || die # for local readline headers |
| 50 |
+ # For local readline headers |
| 51 |
+ ln -s ../.. examples/rlfe/readline || die |
| 52 |
} |
| 53 |
|
| 54 |
src_configure() { |
| 55 |
- # fix implicit decls with widechar funcs |
| 56 |
+ # Fix implicit decls with widechar funcs |
| 57 |
append-cppflags -D_GNU_SOURCE |
| 58 |
# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html |
| 59 |
append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free |
| 60 |
|
| 61 |
- # Make sure configure picks a better ar than `ar`. #484866 |
| 62 |
- export ac_cv_prog_AR=$(tc-getAR) |
| 63 |
+ # Make sure configure picks a better ar than `ar`, bug #484866 |
| 64 |
+ export ac_cv_prog_AR="$(tc-getAR)" |
| 65 |
|
| 66 |
# Force the test since we used sed above to force it. |
| 67 |
export bash_cv_termcap_lib=ncurses |
| 68 |
@@ -160,9 +161,10 @@ src_configure() { |
| 69 |
# In cases where the C library doesn't support wide characters, readline |
| 70 |
# itself won't work correctly, so forcing the answer below should be OK. |
| 71 |
if tc-is-cross-compiler ; then |
| 72 |
- use kernel_Winnt || export bash_cv_func_sigsetjmp='present' |
| 73 |
- export bash_cv_func_ctype_nonascii='yes' |
| 74 |
- export bash_cv_wcwidth_broken='no' #503312 |
| 75 |
+ use kernel_Winnt || export bash_cv_func_sigsetjmp="present" |
| 76 |
+ export bash_cv_func_ctype_nonascii="yes" |
| 77 |
+ # bug #503312 |
| 78 |
+ export bash_cv_wcwidth_broken="no" |
| 79 |
fi |
| 80 |
|
| 81 |
# This is for rlfe, but we need to make sure LDFLAGS doesn't change |
| 82 |
@@ -178,14 +180,15 @@ multilib_src_configure() { |
| 83 |
--with-curses |
| 84 |
$(use_enable static-libs static) |
| 85 |
) |
| 86 |
+ |
| 87 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 88 |
|
| 89 |
if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then |
| 90 |
- # code is full of AC_TRY_RUN() |
| 91 |
+ # Code is full of AC_TRY_RUN() |
| 92 |
mkdir -p examples/rlfe || die |
| 93 |
cd examples/rlfe || die |
| 94 |
- ECONF_SOURCE="${S}"/examples/rlfe \ |
| 95 |
- econf --cache-file="${BUILD_DIR}"/config.cache |
| 96 |
+ |
| 97 |
+ ECONF_SOURCE="${S}"/examples/rlfe econf --cache-file="${BUILD_DIR}"/config.cache |
| 98 |
fi |
| 99 |
} |
| 100 |
|
| 101 |
@@ -193,7 +196,7 @@ multilib_src_compile() { |
| 102 |
emake |
| 103 |
|
| 104 |
if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then |
| 105 |
- # code is full of AC_TRY_RUN() |
| 106 |
+ # Code is full of AC_TRY_RUN() |
| 107 |
cd examples/rlfe || die |
| 108 |
local l |
| 109 |
for l in readline history ; do |
| 110 |
@@ -208,7 +211,8 @@ multilib_src_install() { |
| 111 |
default |
| 112 |
|
| 113 |
if multilib_is_native_abi ; then |
| 114 |
- gen_usr_ldscript -a readline history #4411 |
| 115 |
+ # bug #4411 |
| 116 |
+ gen_usr_ldscript -a readline history |
| 117 |
|
| 118 |
if use utils && ! tc-is-cross-compiler; then |
| 119 |
dobin examples/rlfe/rlfe |
| 120 |
@@ -218,13 +222,14 @@ multilib_src_install() { |
| 121 |
|
| 122 |
multilib_src_install_all() { |
| 123 |
HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs |
| 124 |
+ |
| 125 |
dodoc USAGE |
| 126 |
docinto ps |
| 127 |
dodoc doc/*.ps |
| 128 |
} |
| 129 |
pkg_preinst() { |
| 130 |
# bug #29865 |
| 131 |
- # Reappeared in #595324 with paludis so keeping this for now... |
| 132 |
+ # Reappeared in bug #595324 with paludis so keeping this for now... |
| 133 |
preserve_old_lib \ |
| 134 |
/$(get_libdir)/lib{history,readline}$(get_libname 4) \ |
| 135 |
/$(get_libdir)/lib{history,readline}$(get_libname 5) \ |
| 136 |
|
| 137 |
diff --git a/sys-libs/readline/readline-9999.ebuild b/sys-libs/readline/readline-9999.ebuild |
| 138 |
index 6ab39201ac56..4bc9fb0d90a8 100644 |
| 139 |
--- a/sys-libs/readline/readline-9999.ebuild |
| 140 |
+++ b/sys-libs/readline/readline-9999.ebuild |
| 141 |
@@ -86,7 +86,7 @@ S="${WORKDIR}/${MY_P}" |
| 142 |
|
| 143 |
PATCHES=( |
| 144 |
"${FILESDIR}"/${PN}-5.0-no_rpath.patch |
| 145 |
- "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 |
| 146 |
+ "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch # bug #385091 |
| 147 |
"${FILESDIR}"/${PN}-7.0-headers.patch |
| 148 |
"${FILESDIR}"/${PN}-8.0-headers.patch |
| 149 |
|
| 150 |
@@ -125,8 +125,8 @@ src_prepare() { |
| 151 |
ncurses_libs+=" -ltinfo${ncurses_libs_suffix}" |
| 152 |
fi |
| 153 |
else |
| 154 |
- # Force ncurses linking. #71420 |
| 155 |
- # Use pkg-config to get the right values. #457558 |
| 156 |
+ # Force ncurses linking, bug #71420. |
| 157 |
+ # Use pkg-config to get the right values, bug #457558. |
| 158 |
local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs) |
| 159 |
fi |
| 160 |
|
| 161 |
@@ -137,21 +137,22 @@ src_prepare() { |
| 162 |
-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ |
| 163 |
examples/rlfe/configure || die |
| 164 |
|
| 165 |
- # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated |
| 166 |
+ # Fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated |
| 167 |
# objformat for years, so we don't want to rely on that. |
| 168 |
sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die |
| 169 |
|
| 170 |
- ln -s ../.. examples/rlfe/readline || die # for local readline headers |
| 171 |
+ # For local readline headers |
| 172 |
+ ln -s ../.. examples/rlfe/readline || die |
| 173 |
} |
| 174 |
|
| 175 |
src_configure() { |
| 176 |
- # fix implicit decls with widechar funcs |
| 177 |
+ # Fix implicit decls with widechar funcs |
| 178 |
append-cppflags -D_GNU_SOURCE |
| 179 |
# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html |
| 180 |
append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free |
| 181 |
|
| 182 |
- # Make sure configure picks a better ar than `ar`. #484866 |
| 183 |
- export ac_cv_prog_AR=$(tc-getAR) |
| 184 |
+ # Make sure configure picks a better ar than `ar`, bug #484866 |
| 185 |
+ export ac_cv_prog_AR="$(tc-getAR)" |
| 186 |
|
| 187 |
# Force the test since we used sed above to force it. |
| 188 |
export bash_cv_termcap_lib=ncurses |
| 189 |
@@ -160,9 +161,10 @@ src_configure() { |
| 190 |
# In cases where the C library doesn't support wide characters, readline |
| 191 |
# itself won't work correctly, so forcing the answer below should be OK. |
| 192 |
if tc-is-cross-compiler ; then |
| 193 |
- use kernel_Winnt || export bash_cv_func_sigsetjmp='present' |
| 194 |
- export bash_cv_func_ctype_nonascii='yes' |
| 195 |
- export bash_cv_wcwidth_broken='no' #503312 |
| 196 |
+ use kernel_Winnt || export bash_cv_func_sigsetjmp="present" |
| 197 |
+ export bash_cv_func_ctype_nonascii="yes" |
| 198 |
+ # bug #503312 |
| 199 |
+ export bash_cv_wcwidth_broken="no" |
| 200 |
fi |
| 201 |
|
| 202 |
# This is for rlfe, but we need to make sure LDFLAGS doesn't change |
| 203 |
@@ -178,14 +180,15 @@ multilib_src_configure() { |
| 204 |
--with-curses |
| 205 |
$(use_enable static-libs static) |
| 206 |
) |
| 207 |
+ |
| 208 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 209 |
|
| 210 |
if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then |
| 211 |
- # code is full of AC_TRY_RUN() |
| 212 |
+ # Code is full of AC_TRY_RUN() |
| 213 |
mkdir -p examples/rlfe || die |
| 214 |
cd examples/rlfe || die |
| 215 |
- ECONF_SOURCE="${S}"/examples/rlfe \ |
| 216 |
- econf --cache-file="${BUILD_DIR}"/config.cache |
| 217 |
+ |
| 218 |
+ ECONF_SOURCE="${S}"/examples/rlfe econf --cache-file="${BUILD_DIR}"/config.cache |
| 219 |
fi |
| 220 |
} |
| 221 |
|
| 222 |
@@ -193,7 +196,7 @@ multilib_src_compile() { |
| 223 |
emake |
| 224 |
|
| 225 |
if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then |
| 226 |
- # code is full of AC_TRY_RUN() |
| 227 |
+ # Code is full of AC_TRY_RUN() |
| 228 |
cd examples/rlfe || die |
| 229 |
local l |
| 230 |
for l in readline history ; do |
| 231 |
@@ -208,7 +211,8 @@ multilib_src_install() { |
| 232 |
default |
| 233 |
|
| 234 |
if multilib_is_native_abi ; then |
| 235 |
- gen_usr_ldscript -a readline history #4411 |
| 236 |
+ # bug #4411 |
| 237 |
+ gen_usr_ldscript -a readline history |
| 238 |
|
| 239 |
if use utils && ! tc-is-cross-compiler; then |
| 240 |
dobin examples/rlfe/rlfe |
| 241 |
@@ -218,13 +222,14 @@ multilib_src_install() { |
| 242 |
|
| 243 |
multilib_src_install_all() { |
| 244 |
HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs |
| 245 |
+ |
| 246 |
dodoc USAGE |
| 247 |
docinto ps |
| 248 |
dodoc doc/*.ps |
| 249 |
} |
| 250 |
pkg_preinst() { |
| 251 |
# bug #29865 |
| 252 |
- # Reappeared in #595324 with paludis so keeping this for now... |
| 253 |
+ # Reappeared in bug #595324 with paludis so keeping this for now... |
| 254 |
preserve_old_lib \ |
| 255 |
/$(get_libdir)/lib{history,readline}$(get_libname 4) \ |
| 256 |
/$(get_libdir)/lib{history,readline}$(get_libname 5) \ |
Archives