summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-01-17 23:08:04 +0000
committerMike Frysinger <vapier@gentoo.org>2005-01-17 23:08:04 +0000
commit83ed945090515b83cf2ce9cf67141eb00c94fc47 (patch)
tree07007e6c07c04f0ee02cbb1111ae7a5f5939fd46 /sys-libs/uclibc
parentStable on alpha. (diff)
downloadhistorical-83ed945090515b83cf2ce9cf67141eb00c94fc47.tar.gz
historical-83ed945090515b83cf2ce9cf67141eb00c94fc47.tar.bz2
historical-83ed945090515b83cf2ce9cf67141eb00c94fc47.zip
Make sure uclibc doesnt destroy glibc hosts (sorry solar!) and fix src_test() so it actually works.
Package-Manager: portage-2.0.51-r13
Diffstat (limited to 'sys-libs/uclibc')
-rw-r--r--sys-libs/uclibc/ChangeLog7
-rw-r--r--sys-libs/uclibc/Manifest12
-rw-r--r--sys-libs/uclibc/uclibc-0.9.26-r8.ebuild38
-rw-r--r--sys-libs/uclibc/uclibc-0.9.27.ebuild36
4 files changed, 71 insertions, 22 deletions
diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index 0adf845a65e7..fa5f46b81596 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/uclibc
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.3 2005/01/15 04:13:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.4 2005/01/17 23:08:04 vapier Exp $
+
+ 17 Jan 2005; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.26-r8.ebuild,
+ uclibc-0.9.27.ebuild:
+ Make sure uclibc doesnt destroy glibc hosts (sorry solar!) and fix
+ src_test() so it actually works.
*uclibc-0.9.27 (14 Jan 2005)
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 0034c62db4d5..db2a7f7a7c43 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 b9cdfc9b3e399146b1d5b77300f9f27c ChangeLog 8284
+MD5 c9800c105dd5709742b374c335560842 ChangeLog 8488
MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999
MD5 a4612f199b26df52b09c0055f5672567 uclibc-0.9.26-r7.ebuild 7862
-MD5 7bd7b2a2e1b2956e619c5e30a8d5cdd4 uclibc-0.9.27.ebuild 9290
-MD5 d942a37aaa0f2fb3c52228a50fe26dbb uclibc-0.9.26-r8.ebuild 9772
+MD5 2ac17ac0db6804d65e2055ef0750749b uclibc-0.9.27.ebuild 10062
+MD5 f0cff3cbb3807e78beab2131ad348440 uclibc-0.9.26-r8.ebuild 10249
MD5 6fb9166cb9a919ce76e4ebd58f74fec5 files/0.9.26-r8-cvs.patch 1184
MD5 8801c8a97f025fb426cba64a5b9a4501 files/digest-uclibc-0.9.27 229
MD5 0b733285f186f31c1be9ffcc42f1064e files/getent 973
@@ -22,7 +22,7 @@ MD5 a503ef49001f5f67d61cd40b0809fb76 files/0.9.26/unsecvars.h 682
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.9.14 (GNU/Linux)
-iD8DBQFB6JiJroRuSHgZdywRAhmzAJ42ltiRNGoWlTcoFjbgRnACNRNHHACfRXZ5
-E8kf6tG7FJLyzvb+xroS+VQ=
-=HHk/
+iD8DBQFB7EWHroRuSHgZdywRAkomAJ4+GPnSxn5xd2RNZQqykdFckPjyEACgg1+Y
+6wecDaoatZxWpETwvwLF8do=
+=uYQa
-----END PGP SIGNATURE-----
diff --git a/sys-libs/uclibc/uclibc-0.9.26-r8.ebuild b/sys-libs/uclibc/uclibc-0.9.26-r8.ebuild
index a2fb9d793e53..8b67d9ffcd9a 100644
--- a/sys-libs/uclibc/uclibc-0.9.26-r8.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.26-r8.ebuild
@@ -1,6 +1,6 @@
# 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.9.26-r8.ebuild,v 1.4 2005/01/14 06:43:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.26-r8.ebuild,v 1.5 2005/01/17 23:08:04 vapier Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -10,6 +10,13 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
export CTARGET=${CATEGORY/cross-}
fi
fi
+# Handle the case where we want uclibc on glibc ...
+if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc ]] ; then
+ export UCLIBC_AND_GLIBC="sitting in a tree"
+ export CTARGET=${CHOST%%-*}-pc-linux-uclibc
+else
+ export UCLIBC_AND_GLIBC=""
+fi
# To make a new CVS_VER we do.
# wget -O - http://uclibc.org/downloads/snapshots/uClibc-`date +%Y%m%d`.tar.bz2 | tar jxf -
@@ -32,25 +39,31 @@ LICENSE="LGPL-2"
&& SLOT="${CTARGET}" \
|| SLOT="0"
KEYWORDS="~arm ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="alsa build debug hardened ipv6 static xattr" # nls is not supported yet
+IUSE="alsa build debug hardened ipv6 static" # nls is not supported yet
RESTRICT="nostrip"
-# 2004/11/16 the only binutils w/ relro support for uclibc
DEPEND="sys-devel/gcc"
RDEPEND=""
-PROVIDE="virtual/glibc virtual/libc"
+PROVIDE="virtual/libc"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
+alt_kprefix() {
+ if [[ ${CTARGET} == ${CHOST} ]] || [[ -n ${UCLIBC_AND_GLIBC} ]] ; then
+ echo /usr
+ else
+ echo /usr/${CTARGET}
+ fi
+}
alt_prefix() {
- if [[ ${CTARGET} = ${CHOST} ]] ; then
+ if [[ ${CTARGET} == ${CHOST} ]] ; then
echo /usr
else
echo /usr/${CTARGET}
fi
}
alt_rprefix() {
- if [[ ${CTARGET} = ${CHOST} ]] ; then
+ if [[ ${CTARGET} == ${CHOST} ]] ; then
echo /
else
echo /usr/${CTARGET}
@@ -193,11 +206,11 @@ src_unpack() {
echo "UCLIBC_BUILD_NOEXECSTACK=n" >> .config
fi
- use xattr && echo "UCLIBC_XATTR=y" >> .config
+ echo "UCLIBC_XATTR=y" >> .config
# we are building against system installed kernel headers
sed -i \
- -e "s:KERNEL_SOURCE.*:KERNEL_SOURCE=\"$(alt_prefix)\":" \
+ -e "s:KERNEL_SOURCE.*:KERNEL_SOURCE=\"$(alt_kprefix)\":" \
-e "s:SHARED_LIB_LOADER_PREFIX=.*:SHARED_LIB_LOADER_PREFIX=\"$(alt_rprefix)/$(get_libdir)\":" \
-e "s:DEVEL_PREFIX=.*:DEVEL_PREFIX=\"$(alt_prefix)\":" \
-e "s:RUNTIME_PREFIX=.*:RUNTIME_PREFIX=\"$(alt_rprefix)\":" \
@@ -213,6 +226,7 @@ src_unpack() {
echo
einfo "Runtime Prefix: $(alt_rprefix)"
+ einfo "Kernel Prefix: $(alt_kprefix)"
einfo "Devel Prefix: $(alt_prefix)"
einfo "CBUILD: ${CBUILD:-${CHOST}}"
einfo "CHOST: ${CHOST}"
@@ -252,10 +266,14 @@ src_compile() {
}
src_test() {
+ # This is wrong, but uclibc's tests fail bad when screwing
+ # around with sandbox, so lets just punt it
+ unset LD_PRELOAD
+
# assert test fails on pax/grsec enabled kernels - normal
# vfork test fails in sandbox (both glibc/uclibc)
cd test
- make
+ make || die "test failed"
}
src_install() {
diff --git a/sys-libs/uclibc/uclibc-0.9.27.ebuild b/sys-libs/uclibc/uclibc-0.9.27.ebuild
index dabe565e5dfb..b596e53a6a07 100644
--- a/sys-libs/uclibc/uclibc-0.9.27.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.27.ebuild
@@ -1,6 +1,6 @@
# 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.9.27.ebuild,v 1.1 2005/01/15 04:13:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27.ebuild,v 1.2 2005/01/17 23:08:04 vapier Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -10,6 +10,13 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
export CTARGET=${CATEGORY/cross-}
fi
fi
+# Handle the case where we want uclibc on glibc ...
+if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc ]] ; then
+ export UCLIBC_AND_GLIBC="sitting in a tree"
+ export CTARGET=${CHOST%%-*}-pc-linux-uclibc
+else
+ export UCLIBC_AND_GLIBC=""
+fi
# To make a new CVS_VER we do.
# wget -O - http://uclibc.org/downloads/snapshots/uClibc-`date +%Y%m%d`.tar.bz2 | tar jxf -
@@ -41,15 +48,22 @@ PROVIDE="virtual/libc"
S=${WORKDIR}/${MY_P}
+alt_kprefix() {
+ if [[ ${CTARGET} == ${CHOST} ]] || [[ -n ${UCLIBC_AND_GLIBC} ]] ; then
+ echo /usr
+ else
+ echo /usr/${CTARGET}
+ fi
+}
alt_prefix() {
- if [[ ${CTARGET} = ${CHOST} ]] ; then
+ if [[ ${CTARGET} == ${CHOST} ]] ; then
echo /usr
else
echo /usr/${CTARGET}
fi
}
alt_rprefix() {
- if [[ ${CTARGET} = ${CHOST} ]] ; then
+ if [[ ${CTARGET} == ${CHOST} ]] ; then
echo /
else
echo /usr/${CTARGET}
@@ -192,7 +206,7 @@ src_unpack() {
# we are building against system installed kernel headers
sed -i \
- -e "s:KERNEL_SOURCE.*:KERNEL_SOURCE=\"$(alt_prefix)\":" \
+ -e "s:KERNEL_SOURCE.*:KERNEL_SOURCE=\"$(alt_kprefix)\":" \
-e "s:SHARED_LIB_LOADER_PREFIX=.*:SHARED_LIB_LOADER_PREFIX=\"$(alt_rprefix)/$(get_libdir)\":" \
-e "s:DEVEL_PREFIX=.*:DEVEL_PREFIX=\"$(alt_prefix)\":" \
-e "s:RUNTIME_PREFIX=.*:RUNTIME_PREFIX=\"$(alt_rprefix)\":" \
@@ -205,6 +219,14 @@ src_unpack() {
cp .config myconfig
emake clean >/dev/null || die "could not clean"
+
+ echo
+ einfo "Runtime Prefix: $(alt_rprefix)"
+ einfo "Kernel Prefix: $(alt_kprefix)"
+ einfo "Devel Prefix: $(alt_prefix)"
+ einfo "CBUILD: ${CBUILD:-${CHOST}}"
+ einfo "CHOST: ${CHOST}"
+ einfo "CTARGET: ${CTARGET}"
}
src_compile() {
@@ -240,10 +262,14 @@ src_compile() {
}
src_test() {
+ # This is wrong, but uclibc's tests fail bad when screwing
+ # around with sandbox, so lets just punt it
+ unset LD_PRELOAD
+
# assert test fails on pax/grsec enabled kernels - normal
# vfork test fails in sandbox (both glibc/uclibc)
cd test
- make
+ make || die "test failed"
}
src_install() {