Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 355412 Details for
Bug 480188
sys-libs/ncurses: multilib conversion
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
ebuild diff
ncurses-multilib.patch (text/plain), 5.17 KB, created by
Alexis Ballier
on 2013-08-08 14:13:24 UTC
(
hide
)
Description:
ebuild diff
Filename:
MIME Type:
Creator:
Alexis Ballier
Created:
2013-08-08 14:13:24 UTC
Size:
5.17 KB
patch
obsolete
>--- ncurses-5.9-r2.ebuild 2013-01-17 09:59:35.052811575 -0300 >+++ ncurses-5.9-r3.ebuild 2013-08-08 10:06:22.784019084 -0400 >@@ -2,8 +2,8 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.17 2013/01/17 04:19:21 vapier Exp $ > >-EAPI="1" >-inherit eutils flag-o-matic toolchain-funcs >+EAPI="4" >+inherit eutils flag-o-matic toolchain-funcs multilib-minimal > > MY_PV=${PV:0:3} > PV_SNAP=${PV:4} >@@ -14,19 +14,18 @@ > > LICENSE="MIT" > SLOT="5" >-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" >+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" > IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode" > >-DEPEND="gpm? ( sys-libs/gpm )" >+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" > # berkdb? ( sys-libs/db )" > RDEPEND="${DEPEND} > !<x11-terms/rxvt-unicode-9.06-r3" > > S=${WORKDIR}/${MY_P} >+HOSTTIC_DIR=${WORKDIR}/${P}-host > >-src_unpack() { >- unpack ${A} >- cd "${S}" >+src_prepare() { > [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh > epatch "${FILESDIR}"/${PN}-5.8-gfbsd.patch > epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch >@@ -34,7 +33,7 @@ > epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763 > } > >-src_compile() { >+src_configure() { > unset TERMINFO #115036 > tc-export_build_env BUILD_{CC,CPP} > BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642 >@@ -43,24 +42,26 @@ > # because people often don't keep matching host/target > # ncurses versions #249363 > if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then >- make_flags="-C progs tic" > CHOST=${CBUILD} \ > CFLAGS=${BUILD_CFLAGS} \ > CXXFLAGS=${BUILD_CXXFLAGS} \ > CPPFLAGS=${BUILD_CPPFLAGS} \ > LDFLAGS="${BUILD_LDFLAGS} -static" \ >- do_compile cross --without-shared --with-normal >+ BUILD_DIR="${HOSTTIC_DIR}" do_configure cross --without-shared --with-normal > fi >+ multilib-minimal_src_configure >+} > >- make_flags="" >- do_compile narrowc >- use unicode && do_compile widec --enable-widec --includedir=/usr/include/ncursesw >+multilib_src_configure() { >+ do_configure narrowc >+ use unicode && do_configure widec --enable-widec --includedir=/usr/include/ncursesw > } >-do_compile() { >+ >+do_configure() { > ECONF_SOURCE=${S} > >- mkdir "${WORKDIR}"/$1 >- cd "${WORKDIR}"/$1 >+ mkdir "${BUILD_DIR}"-$1 >+ cd "${BUILD_DIR}"-$1 || die > shift > > # ncurses is dumb and doesn't install .pc files unless pkg-config >@@ -110,36 +111,59 @@ > $(use_with tinfo termlib) \ > ${conf_abi} \ > "$@" >+} >+ >+src_compile() { >+ # when cross-compiling, we need to build up our own tic >+ # because people often don't keep matching host/target >+ # ncurses versions #249363 >+ if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then >+ make_flags="-C progs tic" >+ BUILD_DIR="${HOSTTIC_DIR}" do_compile cross >+ fi >+ >+ multilib-minimal_src_compile >+} >+ >+multilib_src_compile() { >+ make_flags="" >+ multilib_is_native_abi || make_flags="PROGS= " >+ do_compile narrowc >+ use unicode && do_compile widec >+} >+ >+do_compile() { >+ cd "${BUILD_DIR}"-$1 || 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 || die >+ emake -j1 sources > # For some reason, sources depends on pc-files which depends on > # compiled libraries which depends on sources which ... > # Manually delete the pc-files file so the install step will > # create the .pc files we want. > rm -f misc/pc-files >- emake ${make_flags} || die >+ emake ${make_flags} > } > >-src_install() { >+multilib_src_install() { > # use the cross-compiled tic (if need be) #249363 >- export PATH=${WORKDIR}/cross/progs:${PATH} >+ export PATH="${HOSTTIC_DIR}-cross/progs:${PATH}" > > # install unicode version second so that the binaries in /usr/bin > # support both wide and narrow >- cd "${WORKDIR}"/narrowc >- emake DESTDIR="${D}" install || die >+ cd "${BUILD_DIR}"-narrowc || die >+ emake DESTDIR="${D}" install > if use unicode ; then >- cd "${WORKDIR}"/widec >- emake DESTDIR="${D}" install || die >+ cd "${BUILD_DIR}"-widec || die >+ emake DESTDIR="${D}" install > fi > > # Move libncurses{,w} into /lib >- gen_usr_ldscript -a \ >+ multilib_is_native_abi && gen_usr_ldscript -a \ > ncurses \ > $(usex unicode 'ncursesw' '') \ > $(use tinfo && usex unicode 'tinfow' '') \ >@@ -147,6 +171,11 @@ > ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die > use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete > >+ # Build fails to create this ... >+ dosym ../share/terminfo /usr/$(get_libdir)/terminfo >+} >+ >+multilib_src_install_all() { > # if ! use berkdb ; then > # We need the basic terminfo files in /etc, bug #37026 > einfo "Installing basic terminfo files in /etc..." >@@ -163,9 +192,6 @@ > /usr/share/terminfo/${basedir}/${x} > fi > done >- >- # Build fails to create this ... >- dosym ../share/terminfo /usr/$(get_libdir)/terminfo > # fi > > echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 480188
:
355360
|
355362
| 355412 |
355414