diff options
author | Michał Górny <mgorny@gentoo.org> | 2019-09-22 22:00:55 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2019-10-01 21:13:45 +0200 |
commit | 249e377f5bb60138e9c2ba639d479a68d2c26180 (patch) | |
tree | 1a27c4c0d9443d2964786bf62e79a6f561b92d07 /sys-libs | |
parent | sys-libs/ncurses-compat: Split ABI compat version out of ncurses (diff) | |
download | gentoo-249e377f5bb60138e9c2ba639d479a68d2c26180.tar.gz gentoo-249e377f5bb60138e9c2ba639d479a68d2c26180.tar.bz2 gentoo-249e377f5bb60138e9c2ba639d479a68d2c26180.zip |
sys-libs/ncurses: Remove slot :5, moved to ncurses-compat
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/ncurses/Manifest | 1 | ||||
-rw-r--r-- | sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch | 24 | ||||
-rw-r--r-- | sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch | 44 | ||||
-rw-r--r-- | sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch | 45 | ||||
-rw-r--r-- | sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch | 26 | ||||
-rw-r--r-- | sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch | 191 | ||||
-rw-r--r-- | sys-libs/ncurses/ncurses-5.9-r101.ebuild | 198 |
7 files changed, 0 insertions, 529 deletions
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index 74a902fae6ae..65b269a345ce 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -1,4 +1,3 @@ -DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1 DIST ncurses-6.1-20181020-patch.sh.bz2 361598 BLAKE2B e74f6b4e81c822ae500724ebe707031d3157190e96256656940241e4485fa3d96669e069e764cecc829d9fccccc11caaab8c68ae489b083ade4f286647ac74af SHA512 e54bf83cae5bae3ddb909b9bbe91f549b366a5c60b6274f6b27a3f28b5f9f1afe7263487db842f8cbc22a93e0ef17f0fd518a0585523116e192174f44423ae4a DIST ncurses-6.1-20190609-patch.sh.bz2 602174 BLAKE2B 38b1cb1f376b8fdfddc7cf9ed8e10190dd50fc2315f11eaf3a14c0299167c0e6bbd82a3684fa83d6e8fa6d2f02ea14e88ea065f8bb886905d85788bde13731c0 SHA512 efd009f5087a7b16413b94ce37ad19da0df8974be579b742d57bc64e034792ccf03b9967593a0ac5c90522ccfde4b6d23ef763d6fbeb91a5f327f8d7a0970872 DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee diff --git a/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch b/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch deleted file mode 100644 index 0200a14462af..000000000000 --- a/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch +++ /dev/null @@ -1,24 +0,0 @@ -we'll hijack the freebsd* case that comes later - ---- ncurses-5.6/aclocal.m4 -+++ ncurses-5.6/aclocal.m4 -@@ -3806,7 +3806,7 @@ - fi - cf_cv_rm_so_locs=yes - ;; -- linux*|gnu*|k*bsd*-gnu) #(vi -+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi - if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" ---- ncurses-5.6/configure -+++ ncurses-5.6/configure -@@ -3806,7 +3806,7 @@ - fi - cf_cv_rm_so_locs=yes - ;; -- linux*|gnu*|k*bsd*-gnu) #(vi -+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi - if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" - LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" diff --git a/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch b/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch deleted file mode 100644 index 0c6ca7acc4fc..000000000000 --- a/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/ncurses-5.9/c++/cursesf.h b/ncurses-5.9/c++/cursesf.h -index 70a30c3..db38063 100644 ---- a/ncurses-5.9/c++/cursesf.h -+++ b/ncurses-5.9/c++/cursesf.h -@@ -677,7 +677,7 @@ protected: - } - - public: -- NCursesUserForm (NCursesFormField Fields[], -+ NCursesUserForm (NCursesFormField* Fields[], - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE, - bool autoDelete_Fields=FALSE) -@@ -686,7 +686,7 @@ public: - set_user (const_cast<void *>(p_UserData)); - }; - -- NCursesUserForm (NCursesFormField Fields[], -+ NCursesUserForm (NCursesFormField* Fields[], - int nlines, - int ncols, - int begin_y = 0, -diff --git a/ncurses-5.9/c++/cursesm.h b/ncurses-5.9/c++/cursesm.h -index d9c2273..2d5b79a 100644 ---- a/ncurses-5.9/c++/cursesm.h -+++ b/ncurses-5.9/c++/cursesm.h -@@ -635,7 +635,7 @@ protected: - } - - public: -- NCursesUserMenu (NCursesMenuItem Items[], -+ NCursesUserMenu (NCursesMenuItem* Items[], - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE, - bool autoDelete_Items=FALSE) -@@ -644,7 +644,7 @@ public: - set_user (const_cast<void *>(p_UserData)); - }; - -- NCursesUserMenu (NCursesMenuItem Items[], -+ NCursesUserMenu (NCursesMenuItem* Items[], - int nlines, - int ncols, - int begin_y = 0, diff --git a/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch b/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch deleted file mode 100644 index 5c968e76c378..000000000000 --- a/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.gentoo.org/522586 - -delete the -I$includedir paths that get added to CPPFLAGS. these are never -needed when building natively or cross-compiling and really get in the way -in both cases (upgrades/cross-compiling/etc...). - -extracted from the upstream change: -http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=9ee3995474454b7d956885e0fe5c8cac2ae25d42#patch5 - ---- a/configure -+++ b/configure -@@ -18596,33 +18596,11 @@ CPPFLAGS="$CPPFLAGS -I. -I../include" - if test "$srcdir" != "."; then - CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include" - fi --if test "$GCC" != yes; then -- CPPFLAGS="$CPPFLAGS -I\${includedir}" --elif test "$includedir" != "/usr/include"; then -- if test "$includedir" = '${prefix}/include' ; then -- if test $prefix != /usr ; then -- CPPFLAGS="$CPPFLAGS -I\${includedir}" -- fi -- else -- CPPFLAGS="$CPPFLAGS -I\${includedir}" -- fi --fi - - ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS" - if test "$srcdir" != "."; then - ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS" - fi --if test "$GCC" != yes; then -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" --elif test "$includedir" != "/usr/include"; then -- if test "$includedir" = '${prefix}/include' ; then -- if test $prefix != /usr ; then -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" -- fi -- else -- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" -- fi --fi - - ### Build up pieces for makefile rules - echo "$as_me:18628: checking default library suffix" >&5 diff --git a/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch b/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch deleted file mode 100644 index 7c3c04a449f8..000000000000 --- a/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch +++ /dev/null @@ -1,26 +0,0 @@ -disable the $PATH search for the PKG_CONFIG tool. it isn't needed and just -gets in the way when setting to a value that might not yet exist. - -disable the existence test for the PKG_CONFIG_LIBDIR dir. it breaks when you -cross-compile for an ABI that doesn't exist in the root dir (--build). - ---- a/configure -+++ b/configure -@@ -3582,7 +3582,7 @@ fi - esac - - test -z "$PKG_CONFIG" && PKG_CONFIG=none --if test "$PKG_CONFIG" != none ; then -+if false ; then - - if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -@@ -3626,7 +3626,7 @@ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C - PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig - fi - PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` -- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then -+ if test -n "$PKG_CONFIG_LIBDIR" ; then - - # Check whether --enable-pc-files or --disable-pc-files was given. - if test "${enable_pc_files+set}" = set; then diff --git a/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch b/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch deleted file mode 100644 index b6d1924cbe7e..000000000000 --- a/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch +++ /dev/null @@ -1,191 +0,0 @@ -Add rxvt-unicode terminfo, required by rxvt-unicode to function properly. - -Providing this in ncurses makes it widely available, much better than having to -install rxvt-unicode everywhere. - -http://bugs.gentoo.org/show_bug.cgi?id=192083 - -This patch uses the updated rxvt-unicode-9.15 terminfo -which includes 256 color support and fixes Gentoo bug 383871 - -http://bugs.gentoo.org/show_bug.cgi?id=383871 - ---- misc/terminfo.src -+++ misc/terminfo.src -@@ -4208,6 +4208,176 @@ - rxvt-16color|xterm with 16 colors like aixterm, - ncv#32, use=ibm+16color, use=rxvt, - -+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997 -+# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997 -+# Updated: Marc Lehmann <schmorp@schmorp.de>, 17 Feb 2005 -+# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences -+rxvt-unicode|rxvt-unicode terminal (X Window System), -+ am, -+ bce, -+ eo, -+ km, -+ msgr, -+ xenl, -+ hs, -+ cols#80, -+ it#8, -+ lines#24, -+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG, -+ bel=^G, -+ blink=\E[5m, -+ bold=\E[1m, -+ civis=\E[?25l, -+ clear=\E[H\E[2J, -+ cnorm=\E[?25h, -+ cr=^M, -+ csr=\E[%i%p1%d;%p2%dr, -+ cub=\E[%p1%dD, -+ cub1=^H, -+ cud=\E[%p1%dB, -+ cud1=^J, -+ cuf=\E[%p1%dC, -+ cuf1=\E[C, -+ cup=\E[%i%p1%d;%p2%dH, -+ cuu=\E[%p1%dA, -+ cuu1=\E[A, -+ cvvis=\E[?25h, -+ dch=\E[%p1%dP, -+ dch1=\E[P, -+ dl=\E[%p1%dM, -+ dl1=\E[M, -+ ed=\E[J, -+ el=\E[K, -+ el1=\E[1K, -+ flash=\E[?5h$<20/>\E[?5l, -+ home=\E[H, -+ hpa=\E[%i%p1%dG, -+ ht=^I, -+ hts=\EH, -+ ich=\E[%p1%d@, -+ ich1=\E[@, -+ il=\E[%p1%dL, -+ il1=\E[L, -+ ind=^J, -+ is1=\E[\041p, -+ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, -+ kDC=\E[3$, -+ kIC=\E[2$, -+ kEND=\E[8$, -+ kHOM=\E[7$, -+ kLFT=\E[d, -+ kNXT=\E[6$, -+ kPRV=\E[5$, -+ kRIT=\E[c, -+ kbs=\177, -+ ka1=\EOw, -+ ka3=\EOy, -+ kb2=\EOu, -+ kc1=\EOq, -+ kc3=\EOs, -+ kcbt=\E[Z, -+ kcub1=\E[D, -+ kcud1=\E[B, -+ kcuf1=\E[C, -+ kcuu1=\E[A, -+ kdch1=\E[3~, -+ kel=\E[8\^, -+ kend=\E[8~, -+ kent=\EOM, -+ kf1=\E[11~, -+ kf10=\E[21~, -+ kf11=\E[23~, -+ kf12=\E[24~, -+ kf13=\E[25~, -+ kf14=\E[26~, -+ kf15=\E[28~, -+ kf16=\E[29~, -+ kf17=\E[31~, -+ kf18=\E[32~, -+ kf19=\E[33~, -+ kf2=\E[12~, -+ kf20=\E[34~, -+ kf3=\E[13~, -+ kf4=\E[14~, -+ kf5=\E[15~, -+ kf6=\E[17~, -+ kf7=\E[18~, -+ kf8=\E[19~, -+ kf9=\E[20~, -+ kfnd=\E[1~, -+ khome=\E[7~, -+ kich1=\E[2~, -+ kmous=\E[M, -+ knp=\E[6~, -+ kpp=\E[5~, -+ kslt=\E[4~, -+ rc=\E8, -+ rev=\E[7m, -+ ri=\EM, -+ rmso=\E[27m, -+ rmul=\E[24m, -+ rs1=\Ec, -+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, -+ sgr0=\E[m\E(B, -+ enacs=, -+ smacs=\E(0, -+ rmacs=\E(B, -+ smso=\E[7m, -+ smul=\E[4m, -+ tbc=\E[3g, -+ vpa=\E[%i%p1%dd, -+ colors#88, -+ pairs#7744, -+ btns#5, -+ lm#0, -+ ccc, -+ npc, -+ mc5i, -+ ncv#0, -+ mir, -+ xon, -+ bw, -+ ech=\E[%p1%dX, -+ mc0=\E[i, -+ mc4=\E[4i, -+ mc5=\E[5i, -+ sitm=\E[3m, -+ ritm=\E[23m, -+ smam=\E[?7h, -+ rmam=\E[?7l, -+ smir=\E[4h, -+ rmir=\E[4l, -+ smcup=\E[?1049h, -+ rmcup=\E[r\E[?1049l, -+ smkx=\E=, -+ rmkx=\E>, -+ indn=\E[%p1%dS, -+ rin=\E[%p1%dT, -+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, -+ op=\E[39;49m, -+ setaf=\E[38;5;%p1%dm, -+ setab=\E[48;5;%p1%dm, -+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, -+ sc=\E7, -+ s0ds=\E(B, -+ s1ds=\E(0, -+ s2ds=\E*B, -+ s3ds=\E+B, -+ u6=\E[%i%d;%dR, -+ u7=\E[6n, -+ u8=\E[?1;2c, -+ u9=\E[c, -+ tsl=\E]2;, -+ fsl=\007, -+ dsl=\E]2;\007, -+ -+rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System), -+ colors#256, -+ pairs#32767, -+ use=rxvt-unicode, -+ - # mrxvt 0.5.4 - # - # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild deleted file mode 100644 index 8c033aaf8855..000000000000 --- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# This version is just for the ABI .5 library - -EAPI="5" - -inherit eutils toolchain-funcs multilib-minimal - -MY_PV=${PV:0:3} -MY_P=${PN}-${MY_PV} -DESCRIPTION="console display library" -HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/" -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" - -LICENSE="MIT" -# The subslot reflects the SONAME. -SLOT="5/5" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="gpm tinfo unicode" - -DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" -# Block the ncurses-5 that installs the same lib. #557472 -RDEPEND="${DEPEND} - !<sys-libs/ncurses-6:0" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-5.8-gfbsd.patch - "${FILESDIR}"/${PN}-5.7-nongnu.patch - "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871 - "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763 - "${FILESDIR}"/${PN}-5.9-pkg-config.patch - "${FILESDIR}"/${P}-no-I-usr-include.patch #522586 - "${FILESDIR}"/${P}-gcc-5.patch #545114 -) - -src_prepare() { - epatch "${PATCHES[@]}" -} - -src_configure() { - unset TERMINFO #115036 - tc-export_build_env BUILD_{CC,CPP} - BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642 - - # Build the various variants of ncurses -- narrow, wide, and threaded. #510440 - # Order matters here -- we want unicode/thread versions to come last so that the - # binaries in /usr/bin support both wide and narrow. - # The naming is also important as we use these directly with filenames and when - # checking configure flags. - NCURSES_TARGETS=( - ncurses - $(usex unicode 'ncursesw' '') - ) - - # When installing ncurses, we have to use a compatible version of tic. - # This comes up when cross-compiling, doing multilib builds, upgrading, - # or installing for the first time. Build a local copy of tic whenever - # the host version isn't available. #249363 #557598 - if ! ROOT=/ has_version "~sys-libs/${P}" ; then - # We can't re-use the multilib BUILD_DIR because we run outside of it. - BUILD_DIR="${WORKDIR}" \ - CHOST=${CBUILD} \ - CFLAGS=${BUILD_CFLAGS} \ - CXXFLAGS=${BUILD_CXXFLAGS} \ - CPPFLAGS=${BUILD_CPPFLAGS} \ - LDFLAGS="${BUILD_LDFLAGS} -static" \ - do_configure cross --without-shared --with-normal - fi - multilib-minimal_src_configure -} - -multilib_src_configure() { - local t - for t in "${NCURSES_TARGETS[@]}" ; do - do_configure "${t}" - done -} - -do_configure() { - local target=$1 - shift - - mkdir "${BUILD_DIR}/${target}" - cd "${BUILD_DIR}/${target}" || die - - local conf=( - # We need the basic terminfo files in /etc, bug #37026. We will - # add '--with-terminfo-dirs' and then populate /etc/terminfo in - # src_install() ... - --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" - - # Now the rest of the various standard flags. - --without-hashed-db - --disable-pc-files - --with-shared - --without-hashed-db - --without-ada - --without-cxx - --without-cxx-binding - --without-debug - --without-profile - # The configure script uses ldd to parse the linked output which - # is flaky for cross-compiling/multilib/ldd versions/etc... - $(use_with gpm gpm libgpm.so.1) - --disable-termcap - --enable-symlinks - --with-rcs-ids - --with-manpage-format=normal - --enable-const - --enable-colorfgbg - --enable-echo - --disable-warnings - --without-assertions - --enable-leaks - --without-expanded - --with-macros - --without-progs - --without-tests - --without-trace - $(use_with tinfo termlib) - - # The chtype/mmask-t settings below are to retain ABI compat - # with ncurses-5.4 so dont change em ! - --with-chtype=long - --with-mmask-t=long - --disable-ext-colors - --disable-ext-mouse - --without-{pthread,reentrant} - ) - - if [[ ${target} == ncurses*w ]] ; then - conf+=( --enable-widec ) - else - conf+=( --disable-widec ) - fi - # Make sure each variant goes in a unique location. - if [[ ${target} != "ncurses" ]] ; then - conf+=( --includedir="${EPREFIX}"/usr/include/${target} ) - fi - # See comments in src_configure. - if [[ ${target} != "cross" ]] ; then - local cross_path="${WORKDIR}/cross" - [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" - else - conf+=( --with-progs ) - fi - - # Force bash until upstream rebuilds the configure script with a newer - # version of autotools. #545532 - CONFIG_SHELL=/bin/bash \ - ECONF_SOURCE=${S} \ - econf "${conf[@]}" "$@" -} - -src_compile() { - # See comments in src_configure. - if ! ROOT=/ has_version "~sys-libs/${P}" ; then - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs tic - fi - - multilib-minimal_src_compile -} - -multilib_src_compile() { - local t - for t in "${NCURSES_TARGETS[@]}" ; do - do_compile "${t}" - done -} - -do_compile() { - local target=$1 - shift - - cd "${BUILD_DIR}/${target}" || die - - # A little hack to fix parallel builds ... they break when - # generating sources so if we generate the sources first (in - # non-parallel), we can then build the rest of the package - # in parallel. This is not really a perf hit since the source - # generation is quite small. - emake -j1 sources - emake "$@" -} - -multilib_src_install() { - local target lib - for target in "${NCURSES_TARGETS[@]}" ; do - cd "${BUILD_DIR}/${target}/lib" || die - for lib in *5.9 ; do - newlib.so "${lib}" "${lib%%.9}" - done - done -} |