diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2018-04-12 17:45:22 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-04-12 17:45:22 +0200 |
| commit | 2bd8ed47fd1c293f87eb9c64e2a0b3fcae662717 (patch) | |
| tree | 0e3b35d83884c46be7db3443e62f74ddda9b4db8 | |
| parent | sys-libs/readline: EAPI bump and mingw-w64 patch (diff) | |
| download | gentoo-2bd8ed47fd1c293f87eb9c64e2a0b3fcae662717.tar.gz gentoo-2bd8ed47fd1c293f87eb9c64e2a0b3fcae662717.tar.bz2 gentoo-2bd8ed47fd1c293f87eb9c64e2a0b3fcae662717.zip | |
sys-libs/readline: Post EAPI-6 conversion cleanup.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
| -rw-r--r-- | sys-libs/readline/readline-7.0_p3-r1.ebuild | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/sys-libs/readline/readline-7.0_p3-r1.ebuild b/sys-libs/readline/readline-7.0_p3-r1.ebuild index 6bc35b2a6861..ceeb39505bdc 100644 --- a/sys-libs/readline/readline-7.0_p3-r1.ebuild +++ b/sys-libs/readline/readline-7.0_p3-r1.ebuild @@ -7,10 +7,10 @@ inherit flag-o-matic multilib-minimal toolchain-funcs # Official patches # See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MY_P=${PN}-${MY_PV} +PLEVEL="${PV##*_p}" +MY_PV="${PV/_p*}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" [[ ${PV} != *_p* ]] && PLEVEL=0 patches() { [[ ${PLEVEL} -eq 0 ]] && return 1 @@ -29,9 +29,14 @@ patches() { DESCRIPTION="Another cute console display library" HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" + case ${PV} in -*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;; -*) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;; + *_alpha*|*_beta*|*_rc*) + SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" + ;; + *) + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" + ;; esac LICENSE="GPL-3" @@ -53,6 +58,12 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-mingw.patch ) +# Needed because we don't want the patches being unpacked +# (which emits annoying and useless error messages) +src_unpack() { + unpack ${MY_P}.tar.gz +} + src_prepare() { [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s) default @@ -103,18 +114,18 @@ src_configure() { } multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --cache-file="${BUILD_DIR}"/config.cache \ - --docdir='$(datarootdir)'/doc/${PF} \ - --with-curses \ + local myeconfargs=( + --cache-file="${BUILD_DIR}"/config.cache + --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() mkdir -p examples/rlfe || die cd examples/rlfe || die - ECONF_SOURCE=${S}/examples/rlfe \ + ECONF_SOURCE="${S}"/examples/rlfe \ econf --cache-file="${BUILD_DIR}"/config.cache fi } @@ -128,7 +139,7 @@ multilib_src_compile() { local l for l in readline history ; do ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die - ln -sf ../../lib${l}.a lib${l}.a || die + ln -s ../../lib${l}.a lib${l}.a || die done emake fi |