update patch and rewrite ebuild to be more like other system libcs
authorMike Frysinger <vapier@gentoo.org>
Mon, 6 Nov 2006 00:37:11 +0000 (00:37 +0000)
committerMike Frysinger <vapier@gentoo.org>
Mon, 6 Nov 2006 00:37:11 +0000 (00:37 +0000)
Package-Manager: portage-2.1.2_rc1-r2

sys-libs/newlib/Manifest
sys-libs/newlib/files/digest-newlib-1.14.0
sys-libs/newlib/newlib-1.14.0.ebuild

index 48e3525c1744489bddb4028da966eafdffe1912e..c90b0844801481ec18ca3bbd9f5f31c7d2596179 100644 (file)
@@ -1,9 +1,12 @@
-DIST newlib-1.14.0-spu.patch.gz 49856 RMD160 47fde8507a22b1c05bb16a4ba9d58b1021762ce9 SHA1 9ba1b9bf2efefb0f68ed14e91c49dbef0c7ef076 SHA256 6ffd289983ab6f6a138b77a45dd284dc10c42a59d1a3e299654782192a5ca497
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST newlib-1.14.0-spu.patch.bz2 38900 RMD160 d8f90ef2c27ef42c80dc03b4b1e1d1e3bd0f39d3 SHA1 24f66deb65e72eb04724ac3346bfe5026fa4091f SHA256 09bb372bb8d26b9b6f3122f05a473e6850999de5f6408bf9a5bbc1f69554b640
 DIST newlib-1.14.0.tar.gz 7981432 RMD160 6f2b3f32759925142421ddc069229eff857dd106 SHA1 edc50f5cda734b50c5431a2b8d1e579ac82ce3f9 SHA256 7db55671132c2943dbbdadfaa954915c23dbc329168575a42bb940ef4bf50a23
-EBUILD newlib-1.14.0.ebuild 2427 RMD160 5ffc56b486e4ad4607cef1418318ad02e7dddacc SHA1 dfbe9d41cf356781daa069db6873d91f5416c0d1 SHA256 58794941e9e63876a0f80306b664c795999cd15b1b3d3f2ce4440316f83d290a
-MD5 e18d4bdc39b2c20b8ed73781eeb6bf02 newlib-1.14.0.ebuild 2427
-RMD160 5ffc56b486e4ad4607cef1418318ad02e7dddacc newlib-1.14.0.ebuild 2427
-SHA256 58794941e9e63876a0f80306b664c795999cd15b1b3d3f2ce4440316f83d290a newlib-1.14.0.ebuild 2427
+EBUILD newlib-1.14.0.ebuild 1928 RMD160 a0b64d6784524cb1163e6a0f2144aae61dbe501c SHA1 b7f10343282b67cb5ec4b8eb997c496c337aeed7 SHA256 2415387c5a19413b66af2130a8bf343c2600327d37306a9b492c752aaf19b212
+MD5 7c51017a2930d2f43ee041639f065d3e newlib-1.14.0.ebuild 1928
+RMD160 a0b64d6784524cb1163e6a0f2144aae61dbe501c newlib-1.14.0.ebuild 1928
+SHA256 2415387c5a19413b66af2130a8bf343c2600327d37306a9b492c752aaf19b212 newlib-1.14.0.ebuild 1928
 MISC ChangeLog 346 RMD160 8baab103930e439a5685d8fb637b87bdc21047dc SHA1 7609f9e70b6d3dfd040c7828d8e1b0875de35e63 SHA256 470c1f3e98bee8d5ccc1621a979fc967ead6571e8e0975ed52d043ee1eae1ad3
 MD5 332e764035b01f7672eb1f04e4fb7ea5 ChangeLog 346
 RMD160 8baab103930e439a5685d8fb637b87bdc21047dc ChangeLog 346
@@ -12,6 +15,13 @@ MISC metadata.xml 223 RMD160 f3503c1d2d441f248d9ab96397befec4ee8a952d SHA1 77b37
 MD5 7c1c8e9dbaf579e37b0707f85f905a51 metadata.xml 223
 RMD160 f3503c1d2d441f248d9ab96397befec4ee8a952d metadata.xml 223
 SHA256 d0effd32fc7c73c97f14108c4bdb0c2636af5763f7c0a987ad7ea264921a827f metadata.xml 223
-MD5 57fecc46f815fa893f86beb6133f8880 files/digest-newlib-1.14.0 500
-RMD160 5a92cdb1959865d6f469b376d89faf0ac4adce0c files/digest-newlib-1.14.0 500
-SHA256 d4069d5318ec1cba6c1c7fa5dbea73590215f41e5497937a92a4c722e15cbf7e files/digest-newlib-1.14.0 500
+MD5 20a3f08c9ad9c0baa6dad879f5d3f89c files/digest-newlib-1.14.0 503
+RMD160 12e974f2f8bbde6c76795dea94905820e2833738 files/digest-newlib-1.14.0 503
+SHA256 ee44c964c8c2bbdb7b8815557862fdfcbc9c2a7c287647d8ab911e2b92c325b2 files/digest-newlib-1.14.0 503
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFToPaamhnQswr0vIRAtEfAJ4nkC7M5zAhclI/KKMlpYXjiorsnwCgkEom
+rQv6nVgFDkb5wrsty584GVo=
+=J3aE
+-----END PGP SIGNATURE-----
index ae27cff91593e7520635f623b934811c9735bbd8..49b634bab7b766137fe91190d00ba024fc4301f1 100644 (file)
@@ -1,6 +1,6 @@
-MD5 209154baba054525a22d056ad3de9fc5 newlib-1.14.0-spu.patch.gz 49856
-RMD160 47fde8507a22b1c05bb16a4ba9d58b1021762ce9 newlib-1.14.0-spu.patch.gz 49856
-SHA256 6ffd289983ab6f6a138b77a45dd284dc10c42a59d1a3e299654782192a5ca497 newlib-1.14.0-spu.patch.gz 49856
+MD5 3e9f8ffa5c7ea5c75ae623db28070123 newlib-1.14.0-spu.patch.bz2 38900
+RMD160 d8f90ef2c27ef42c80dc03b4b1e1d1e3bd0f39d3 newlib-1.14.0-spu.patch.bz2 38900
+SHA256 09bb372bb8d26b9b6f3122f05a473e6850999de5f6408bf9a5bbc1f69554b640 newlib-1.14.0-spu.patch.bz2 38900
 MD5 3fa663f131b355d3adb24ead4df678f2 newlib-1.14.0.tar.gz 7981432
 RMD160 6f2b3f32759925142421ddc069229eff857dd106 newlib-1.14.0.tar.gz 7981432
 SHA256 7db55671132c2943dbbdadfaa954915c23dbc329168575a42bb940ef4bf50a23 newlib-1.14.0.tar.gz 7981432
index b6993492a48bdddd179a74f45060da1af40d6131..13f66009aa2dab3091f96a5b75fa3743b4696c36 100644 (file)
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.14.0.ebuild,v 1.2 2006/08/23 08:55:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.14.0.ebuild,v 1.3 2006/11/06 00:37:11 vapier Exp $
 
-inherit eutils flag-o-matic gnuconfig autotools
+inherit eutils flag-o-matic
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -20,7 +20,7 @@ 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
-                mirror://gentoo/${P}-spu.patch.gz"
+       mirror://gentoo/${P}-spu.patch.bz2"
 
 LICENSE="NEWLIB LIBGLOSS GPL-2"
 [[ ${CTARGET} != ${CHOST} ]] \
@@ -28,71 +28,49 @@ LICENSE="NEWLIB LIBGLOSS GPL-2"
        || SLOT="0"
 KEYWORDS="-* ~ppc64 ~ppc"
 IUSE="nls threads unicode multilib"
+RESTRICT="strip"
 
-DEPEND="sys-devel/gnuconfig"
+DEPEND=""
 RDEPEND=""
 
-RESTRICT="nostrip"
-
 NEWLIBBUILD="${WORKDIR}/build"
 
-alt_build_kprefix() {
-       if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \
-          || [[ -n ${UCLIBC_AND_GLIBC} ]]
-       then
-               echo /usr
-       else
-               echo /usr/${CTARGET}/usr
-       fi
-}
-
 src_unpack() {
        unpack ${A}
-       epatch ${WORKDIR}/${P}-spu.patch
-       einfo "Updating configure scripts"
-       cd ${S}
-       gnuconfig_update
-       export WANT_AUTOCONF=2.1
-       # ugly workaround
-       for a in libgloss libgloss/doc libgloss/libnosys
-       do
-               pushd ${S}/${a} >/dev/null
-               aclocal 2>/dev/null
-               autoconf 2>/dev/null
-               popd >/dev/null
-       done
-       mkdir ${NEWLIBBUILD}
+       epatch "${WORKDIR}"/${P}-spu.patch
+       mkdir -p "${NEWLIBBUILD}"
 }
 
 src_compile() {
+       # we should fix this ...
+       unset LDFLAGS
+       CHOST=${CTARGET} strip-unsupported-flags
+
        local myconf=""
-#hardwired to avoid breakages
+       # hardwired to avoid breakages
        [[ ${CTARGET} == *-softfloat-* ]] \
                && myconf="--disable-newlib-hw-fp" \
                || myconf="--enable-newlib-hw-fp"
-
-#to the user discretion
-       myconf="${myconf} `use_enable unicode newlib-mb`"
-       myconf="${myconf} `use_enable nls`"
-       myconf="${myconf} `use_enable multilib`"
        [[ ${CTARGET} == "spu" ]] \
                && myconf="${myconf} --disable-threads" \
-               || myconf="${myconf} `use_enable threads`"
+               || myconf="${myconf} $(use_enable threads)"
 
-       cd ${NEWLIBBUILD}
+       cd "${NEWLIBBUILD}"
 
-       ../${P}/configure \
-               --host=${CHOST} \
-               --target=${CTARGET} \
-               --prefix=/usr \
-               ${myconf} || die "econf failed"
+       ECONF_SOURCE=${S} \
+       econf \
+               $(use_enable unicode newlib-mb) \
+               $(use_enable nls) \
+               $(use_enable multilib) \
+               ${myconf} \
+               || die "econf failed"
        emake || die "emake failed"
 }
 
 src_install() {
-       cd ${NEWLIBBUILD}
-       emake -j1 DESTDIR=${D} install
+       cd "${NEWLIBBUILD}"
+       emake -j1 DESTDIR="${D}" install
        env -uRESTRICT CHOST=${CTARGET} prepallstrip
        # minor hack to keep things clean
-       rm -fR ${D}/usr/info
+       rm -fR "${D}"/usr/info
 }