diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-02-12 23:49:01 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-02-12 23:49:01 +0000 |
| commit | 61e7d333e04fb8f8fc9613889d89683aadb8a268 (patch) | |
| tree | 8a384b5b54a89a01c0f554d9f37fbb00f165aac3 /sys-libs | |
| parent | old (diff) | |
| download | gentoo-2-61e7d333e04fb8f8fc9613889d89683aadb8a268.tar.gz gentoo-2-61e7d333e04fb8f8fc9613889d89683aadb8a268.tar.bz2 gentoo-2-61e7d333e04fb8f8fc9613889d89683aadb8a268.zip | |
Do not allow newlib to install alongside glibc.
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/newlib/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/newlib/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/newlib/newlib-1.18.0.ebuild | 24 |
3 files changed, 19 insertions, 14 deletions
diff --git a/sys-libs/newlib/ChangeLog b/sys-libs/newlib/ChangeLog index 6a62fa55cd79..00c2560b8849 100644 --- a/sys-libs/newlib/ChangeLog +++ b/sys-libs/newlib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/newlib -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/ChangeLog,v 1.13 2010/02/28 20:12:04 lu_zero Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/ChangeLog,v 1.14 2011/02/12 23:49:01 vapier Exp $ + + 12 Feb 2011; Mike Frysinger <vapier@gentoo.org> newlib-1.18.0.ebuild: + Do not allow newlib to install alongside glibc. 28 Feb 2010; Luca Barbato <lu_zero@gentoo.org> newlib-1.18.0.ebuild: Make use of newlib-multithread as suggested by Olivier Huber diff --git a/sys-libs/newlib/Manifest b/sys-libs/newlib/Manifest index bc0cdc860153..7db761c31abd 100644 --- a/sys-libs/newlib/Manifest +++ b/sys-libs/newlib/Manifest @@ -8,6 +8,6 @@ EBUILD newlib-1.14.0.ebuild 2010 RMD160 7d70de247838d1c920dc49afda7fdf234b583504 EBUILD newlib-1.15.0.ebuild 1932 RMD160 c5a69506a23c7e5afd5988d2d53d4cd9f912e061 SHA1 fb311aac7fdffd0dfeb219293d4046b186f857ca SHA256 27af6cea5ef497e90379dcc8ff0fbb908f6cd30503282cbf0c791eecaceb4a0b EBUILD newlib-1.16.0.ebuild 1933 RMD160 cbd71347282004997b8851f24a64572f21f755b5 SHA1 bdad92eecacb30283759c49888a542f1dd0f5e3b SHA256 9a890cf9d3a77cbfe2b13254ee19868ccfc3fd96d7c6ae832d67cb935b457978 EBUILD newlib-1.16.0_pre20071025.ebuild 1948 RMD160 a29a0d70d82dce40fc9653f2628a64ab78b4d94a SHA1 58ef872071955d34041f9091e5d0da891bb95b8c SHA256 552cce66374b4491bdbda1b27df61bb32ebf8c8f88ad9d29065945636e890cd6 -EBUILD newlib-1.18.0.ebuild 1964 RMD160 008e0a20b292dd83a430ba454f3ae0f38dbb724f SHA1 3718b7fdcc46a8617ee80e410ee89182c7e226fb SHA256 fdc8bffbaaf676bd12627982201e7f0abbf3457916719a684760f7b40e9d2e33 +EBUILD newlib-1.18.0.ebuild 1994 RMD160 8f4c5ac28dd452db857c69e9e549855f8ce84049 SHA1 bde5bb8237891cb6bd59be4728178a6334542ff2 SHA256 2cf4476ff754d6ef7d5a300e7a61ca362d106e01b7470258bfbc49e270958897 MISC ChangeLog 2092 RMD160 6589b6200be4ec9aed09c3047e1e88448971e8dc SHA1 432fe763687dc3fdda08d07034e620498e4896d9 SHA256 ea923deb5b29afa76e9939269ffb159d9209b9f57dcea3285d71ca8810f62246 MISC metadata.xml 223 RMD160 f3503c1d2d441f248d9ab96397befec4ee8a952d SHA1 77b37f3782875cc566e33c72b4536df86ff96df3 SHA256 d0effd32fc7c73c97f14108c4bdb0c2636af5763f7c0a987ad7ea264921a827f diff --git a/sys-libs/newlib/newlib-1.18.0.ebuild b/sys-libs/newlib/newlib-1.18.0.ebuild index 42d5ebb715b6..a9e323c98012 100644 --- a/sys-libs/newlib/newlib-1.18.0.ebuild +++ b/sys-libs/newlib/newlib-1.18.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.18.0.ebuild,v 1.2 2010/02/28 20:12:04 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.18.0.ebuild,v 1.3 2011/02/12 23:49:01 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -12,11 +12,6 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then fi fi -# Handle the case where we want newlib on glibc ... -if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-newlib ]] ; then - export CTARGET=${CHOST%%-*}-pc-linux-newlib -fi - DESCRIPTION="Newlib is a C library intended for use on embedded systems" HOMEPAGE="http://sourceware.org/newlib/" SRC_URI="ftp://sources.redhat.com/pub/newlib/${P}.tar.gz" @@ -29,11 +24,18 @@ KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" IUSE="nls threads unicode crosscompile_opts_headers-only" RESTRICT="strip" -DEPEND="" -RDEPEND="" - NEWLIBBUILD="${WORKDIR}/build" +pkg_setup() { + # Reject newlib-on-glibc type installs + if [[ ${CTARGET} == ${CHOST} ]] ; then + case ${CHOST} in + *-newlib|*-elf) ;; + *) die "Use sys-devel/crossdev to build a newlib toolchain" ;; + esac + fi +} + src_unpack() { unpack ${A} mkdir -p "${NEWLIBBUILD}" @@ -66,7 +68,7 @@ src_compile() { src_install() { cd "${NEWLIBBUILD}" - emake -j1 DESTDIR="${D}" install + emake -j1 DESTDIR="${D}" install || die # env -uRESTRICT CHOST=${CTARGET} prepallstrip # minor hack to keep things clean rm -fR "${D}"/usr/share/info |