commit: bbe9df2faea3c51501ba9764cdaf88cb76cc8ab0 Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Tue Feb 6 05:09:08 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Feb 7 19:19:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe9df2f
sys-libs/readline: remove usr-ldscript support Per news item 2024-01-05-usr-initramfs, we no longer support this use case. It is fragile and hacky and leads to bizarre forms of load errors. The functionality is, despite being called "split-usr", not really about split-usr at all. Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> ...ine-8.2_p7.ebuild => readline-8.1_p2-r2.ebuild} | 147 ++++++++------------- ...ine-8.2_p7.ebuild => readline-8.2_p7-r1.ebuild} | 7 +- 2 files changed, 59 insertions(+), 95 deletions(-) diff --git a/sys-libs/readline/readline-8.2_p7.ebuild b/sys-libs/readline/readline-8.1_p2-r2.ebuild similarity index 56% copy from sys-libs/readline/readline-8.2_p7.ebuild copy to sys-libs/readline/readline-8.1_p2-r2.ebuild index 7b772ace3779..f4b96cca45d4 100644 --- a/sys-libs/readline/readline-8.2_p7.ebuild +++ b/sys-libs/readline/readline-8.1_p2-r2.ebuild @@ -1,14 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# There's no standard way of versioning the point releases upstream -# make anyway, so while this was added for RC versions, it's fine -# in general. -QA_PKGCONFIG_VERSION=$(ver_cut 1-2) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc -inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig +inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs verify-sig # Official patches # See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/ @@ -18,70 +14,54 @@ MY_PV="${MY_PV/_/-}" MY_P="${PN}-${MY_PV}" MY_PATCHES=() -is_release() { - case ${PV} in - 9999|*_alpha*|*_beta*|*_rc*) - return 1 - ;; - *) - return 0 - ;; - esac -} - [[ ${PV} != *_p* ]] && PLEVEL=0 DESCRIPTION="Another cute console display library" -HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html https://git.savannah.gnu.org/cgit/readline.git"; +HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"; -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/git/readline.git"; - EGIT_BRANCH=devel - inherit git-r3 -elif is_release ; then - SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" - SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )" +case ${PV} in + *_alpha*|*_beta*|*_rc*) + SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"; + SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )" + ;; - if [[ ${PLEVEL} -gt 0 ]] ; then - # bash-5.1 -> bash51 - my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2)) + *) + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )" - patch_url= - my_patch_index= + if [[ ${PLEVEL} -gt 0 ]] ; then + # bash-5.1 -> bash51 + my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2)) - upstream_url_base="mirror://gnu/readline" - mirror_url_base="ftp://ftp.cwru.edu/pub/readline"; + patch_url= + my_patch_index= - for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do - printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} - patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash"; - SRC_URI+=" ${patch_url}" - SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" - # Add in the mirror URL too. - SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" - SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" - MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) - done + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" - unset my_p patch_url my_patch_index upstream_url_base mirror_url_base - fi -else - SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/readline/${MY_P}.tar.gz"; - SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/readline/${MY_P}.tar.gz.sig )" -fi + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) + done -if ! is_release ; then - inherit autotools -fi + unset my_p patch_url my_patch_index upstream_url_base mirror_url_base + fi + ;; +esac LICENSE="GPL-3+" SLOT="0/8" # subslot matches SONAME major -if is_release ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi +[[ ${PV} == *_rc* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs +unicode utils" RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]" @@ -93,23 +73,19 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-5.0-no_rpath.patch - "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch # bug #385091 + "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 "${FILESDIR}"/${PN}-7.0-headers.patch "${FILESDIR}"/${PN}-8.0-headers.patch - - # TODO: rebase - #"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch + "${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch + "${FILESDIR}"/${PN}-8.1-windows-signals.patch ) +# Needed because we don't want the patches being unpacked +# (which emits annoying and useless error messages) src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - else - # Needed because we don't want the patches being unpacked - # (which emits annoying and useless error messages) - verify-sig_src_unpack - unpack ${MY_P}.tar.gz - fi + verify-sig_src_unpack + + unpack ${MY_P}.tar.gz } src_prepare() { @@ -117,8 +93,6 @@ src_prepare() { default - is_release || eautoreconf - if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then # If we're bootstrapping, make a guess. We don't have pkg-config # around yet. bug #818103. @@ -132,8 +106,8 @@ src_prepare() { ncurses_libs+=" -ltinfo${ncurses_libs_suffix}" fi else - # Force ncurses linking, bug #71420. - # Use pkg-config to get the right values, bug #457558. + # Force ncurses linking. #71420 + # Use pkg-config to get the right values. #457558 local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs) fi @@ -144,22 +118,21 @@ src_prepare() { -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ examples/rlfe/configure || die - # Fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated + # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated # objformat for years, so we don't want to rely on that. sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die - # For local readline headers - ln -s ../.. examples/rlfe/readline || die + ln -s ../.. examples/rlfe/readline || die # for local readline headers } src_configure() { - # Fix implicit decls with widechar funcs + # fix implicit decls with widechar funcs append-cppflags -D_GNU_SOURCE # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free - # Make sure configure picks a better ar than `ar`, bug #484866 - export ac_cv_prog_AR="$(tc-getAR)" + # Make sure configure picks a better ar than `ar`. #484866 + export ac_cv_prog_AR=$(tc-getAR) # Force the test since we used sed above to force it. export bash_cv_termcap_lib=ncurses @@ -168,10 +141,9 @@ src_configure() { # In cases where the C library doesn't support wide characters, readline # itself won't work correctly, so forcing the answer below should be OK. if tc-is-cross-compiler ; then - export bash_cv_func_sigsetjmp="present" - export bash_cv_func_ctype_nonascii="yes" - # bug #503312 - export bash_cv_wcwidth_broken="no" + export bash_cv_func_sigsetjmp='present' + export bash_cv_func_ctype_nonascii='yes' + export bash_cv_wcwidth_broken='no' #503312 fi # This is for rlfe, but we need to make sure LDFLAGS doesn't change @@ -187,15 +159,14 @@ multilib_src_configure() { --with-curses $(use_enable static-libs static) ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then - # Code is full of AC_TRY_RUN() + # code is full of AC_TRY_RUN() mkdir -p examples/rlfe || die cd examples/rlfe || die - - ECONF_SOURCE="${S}"/examples/rlfe econf --cache-file="${BUILD_DIR}"/config.cache + ECONF_SOURCE="${S}"/examples/rlfe \ + econf --cache-file="${BUILD_DIR}"/config.cache fi } @@ -203,7 +174,7 @@ multilib_src_compile() { emake if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then - # Code is full of AC_TRY_RUN() + # code is full of AC_TRY_RUN() cd examples/rlfe || die local l for l in readline history ; do @@ -218,9 +189,6 @@ multilib_src_install() { default if multilib_is_native_abi ; then - # bug #4411 - gen_usr_ldscript -a readline history - if use utils && ! tc-is-cross-compiler; then dobin examples/rlfe/rlfe fi @@ -229,14 +197,13 @@ multilib_src_install() { multilib_src_install_all() { HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs - dodoc USAGE docinto ps dodoc doc/*.ps } pkg_preinst() { # bug #29865 - # Reappeared in bug #595324 with paludis so keeping this for now... + # Reappeared in #595324 with paludis so keeping this for now... preserve_old_lib \ /$(get_libdir)/lib{history,readline}$(get_libname 4) \ /$(get_libdir)/lib{history,readline}$(get_libname 5) \ diff --git a/sys-libs/readline/readline-8.2_p7.ebuild b/sys-libs/readline/readline-8.2_p7-r1.ebuild similarity index 98% rename from sys-libs/readline/readline-8.2_p7.ebuild rename to sys-libs/readline/readline-8.2_p7-r1.ebuild index 7b772ace3779..a7f0d5654c3a 100644 --- a/sys-libs/readline/readline-8.2_p7.ebuild +++ b/sys-libs/readline/readline-8.2_p7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ EAPI=7 # in general. QA_PKGCONFIG_VERSION=$(ver_cut 1-2) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc -inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig +inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs verify-sig # Official patches # See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/ @@ -218,9 +218,6 @@ multilib_src_install() { default if multilib_is_native_abi ; then - # bug #4411 - gen_usr_ldscript -a readline history - if use utils && ! tc-is-cross-compiler; then dobin examples/rlfe/rlfe fi
