merge a bunch of fixes from psm

diff --git a/sys-libs/uclibc++/Manifest b/sys-libs/uclibc++/Manifest
index 96f093dd69cb23fadf1db26845934af221dc80c1..d27a00ea852c7aa765089846b0e740c7369ae676 100644 (file)
--- a/sys-libs/uclibc++/Manifest
+++ b/sys-libs/uclibc++/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ad0f6370dc4c25cb5c57346057026435 uclibc++-0.1.8.ebuild 1317
+MD5 ebcdf62d71d1f590552ba8d07a9dc1bb uclibc++-0.1.8.ebuild 1811
 MD5 50397d7582c62a0754dd5204acf0a902 ChangeLog 333
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
-MD5 a901c9aaefec85a5a52af92d49a2f09e files/digest-uclibc++-0.1.8 64
 MD5 d43392a03d5232ce855c01cb22c38007 files/0.1.8-pop_back.patch 439
+MD5 a901c9aaefec85a5a52af92d49a2f09e files/digest-uclibc++-0.1.8 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB4oldroRuSHgZdywRAj+fAJ9R7bYNlf+Qc8HmGj//KoLQhOAIYACeOJnO
-MmAtykRW1Tu3EOc0DPKFPEM=
-=yXRp
+iD8DBQFB5KctroRuSHgZdywRAkr3AJ9MUw6P0fMRttWxivK2xDvSNIs9awCggNnA
+jA6nlBmDFuMxmgfah8isCug=
+=0H5K
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/uclibc++/uclibc++-0.1.8.ebuild b/sys-libs/uclibc++/uclibc++-0.1.8.ebuild
index 2ef39ca88a566551acdf49dadbbb1b1253826294..d4a3c3bb1a4c5e8fc6f3b62999d00355cc5c4bd6 100644 (file)
--- a/sys-libs/uclibc++/uclibc++-0.1.8.ebuild
+++ b/sys-libs/uclibc++/uclibc++-0.1.8.ebuild
@@ -1,17 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc++/uclibc++-0.1.8.ebuild,v 1.2 2005/01/10 13:55:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc++/uclibc++-0.1.8.ebuild,v 1.3 2005/01/12 04:26:57 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+       if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+               export CTARGET=${CATEGORY/cross-}
+       fi
+fi
 
 DESCRIPTION="embedded C++ library"
 HOMEPAGE="http://cxx.uclibc.org/"
 SRC_URI="http://cxx.uclibc.org/src/uClibc++-${PV}.tbz2"
 
 LICENSE="GPL-2"
-SLOT="0"
+[[ ${CTARGET} != ${CHOST} ]] \
+       && SLOT="${CTARGET}" \
+       || SLOT="0"
 KEYWORDS="~arm ~ppc ~x86"
-IUSE=""
+IUSE="debug static"
 
 DEPEND=""
 
@@ -22,14 +31,13 @@ src_unpack() {
        cd ${S}
        make defconfig || die "defconfig failed"
 
-       export CTARGET="${CTARGET:-${CHOST}}"
        local target
-       case ${CTARGET} in
-               arm*)           target="arm";;
-               mips*)          target="mips";;
-               powerpc*)       target="powerpc";;
-               i?86*)          target="i386";;
-               *)                      die "${CTARGET} lists no defaults :/";;
+       case $(tc-arch ${CTARGET}) in
+               arm)    target="arm";;
+               mips)   target="mips";;
+               ppc)    target="powerpc";;
+               x86)    target="i386";;
+               *)              die "$(tc-arch ${CTARGET}) lists no defaults :/";;
        esac
 
        sed -i \
@@ -37,20 +45,28 @@ src_unpack() {
                -e '/^TARGET_'${target}'/d' \
                .config
 
-       cat << EOF >> .config
-TARGET_${target}=y
-UCLIBCXX_RUNTIME_PREFIX="/usr/${CTARGET}"
-EOF
+       echo "UCLIBCXX_RUNTIME_PREFIX=\"/usr/${CTARGET}\"" >> .config
        echo "TARGET_${target}=y" >> .config
+       use debug && echo "CONFIG_DODEBUG=y" >> .config
 
        yes "" | make oldconfig || die "oldconfig failed"
 
+       # has to come after make oldconfig, else it will be disabled
+       echo "BUILD_STATIC_LIB=y" >> .config
+       if use static ; then
+               echo "BUILD_ONLY_STATIC_LIB=y" >> .config
+       fi
+
        # Patches!
        epatch "${FILESDIR}"/${PV}-pop_back.patch
 }
 
 src_compile() {
-       emake -j1 CROSS=${CTARGET}- || die "make failed"
+       emake -j1 ARCH_CFLAGS="${CFLAGS}" CROSS=${CTARGET}- || die "make failed"
+}
+
+src_test() {
+       make test || die "test failed"
 }
 
 src_install() {