version bump. Now uses binutils 2.14.90.0.8 and gcc-3.3.3. Lots of syntax/logic errors fixed also

4 files changed, 47 insertions, 32 deletions

diff --git a/sys-devel/uclibc-buildroot/ChangeLog b/sys-devel/uclibc-buildroot/ChangeLog
index 682482294b8b..e795c83032c2 100644
--- a/sys-devel/uclibc-buildroot/ChangeLog
+++ b/sys-devel/uclibc-buildroot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/uclibc-buildroot
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/uclibc-buildroot/ChangeLog,v 1.6 2004/02/09 23:41:33 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/uclibc-buildroot/ChangeLog,v 1.7 2004/02/20 02:24:11 dragonheart Exp $
+
+*uclibc-buildroot-20040218 (20 Feb 2004)
+
+  20 Feb 2004; Daniel Black <dragonheart@gentoo.org>
+  uclibc-buildroot-20040218.ebuild:
+  version bump. Now uses binutils 2.14.90.0.8 and gcc-3.3.3. Lots of syntax/log
+  errors fixed too.
 
 *uclibc-buildroot-20040209 (10 Feb 2004)
 
diff --git a/sys-devel/uclibc-buildroot/files/digest-uclibc-buildroot-20040131 b/sys-devel/uclibc-buildroot/files/digest-uclibc-buildroot-20040218
index 8c5c6a75f993..8a0b5e15264e 100644
--- a/sys-devel/uclibc-buildroot/files/digest-uclibc-buildroot-20040131
+++ b/sys-devel/uclibc-buildroot/files/digest-uclibc-buildroot-20040218
@@ -1,11 +1,11 @@
-MD5 65999f654102f5438ac8562d13a6eced gcc-3.3.2.tar.bz2 23585904
-MD5 8f6c56a3239051e68be5469412b43f32 buildroot-20040131.tar.bz2 446486
-MD5 71b99dba3045a359dc314dbebedcf502 binutils-2.14.90.0.6.tar.bz2 10399066
-MD5 164372c3b7c1d43f00a0c66d893a2a10 kernel-headers-2.4.21.tar.bz2 3776596
+MD5 3c6cfd9fcd180481063b4058cf6faff2 gcc-3.3.3.tar.bz2 23279245
+MD5 2a4df20b99fe06440a1669a06058aa2c buildroot-20040218.tar.bz2 443350
+MD5 3e28792a585e14b57838cd24130a24dd binutils-2.14.90.0.8.tar.bz2 11015696
+MD5 987e1f0a1fd00437d8773a521930557d kernel-headers-2.4.25.tar.bz2 4152598
 MD5 7212713c432dd0de6ec2140c2a6212e4 uClibc-0.9.26.tar.bz2 1604543
 MD5 d75b2239b4e27c3c9cbed1c8f6eabba6 uClibc-locale-030818.tgz 236073
 MD5 a18c8048786b88fc042f92823c6a1cd1 elf2flt-20030620.tar.bz2 51298
-MD5 64e3de00bd6bb9a6689afe208bd8a636 busybox-1.00-pre6.tar.bz2 1103543
+MD5 b59435eafef2924502b07bcf2e75613d busybox-1.00-pre7.tar.bz2 1103451
 MD5 44da0ff2b727455669890b24305e351d tinylogin-1.4.tar.bz2 98502
 MD5 3501a47b14e92be3b1de2a90eb5f10cc libfloat_990616.orig.tar.gz 1475698
 MD5 a51efc8a3b3619b0b7ed084efa812474 libfloat_990616-3.diff.gz 2985
diff --git a/sys-devel/uclibc-buildroot/metadata.xml b/sys-devel/uclibc-buildroot/metadata.xml
index 0548674d6b4e..9a0bbb653be9 100644
--- a/sys-devel/uclibc-buildroot/metadata.xml
+++ b/sys-devel/uclibc-buildroot/metadata.xml
@@ -4,6 +4,6 @@
 <herd>embedded</herd>
 <maintainer>
   <email>dragonheart@gentoo.org</email>
-  <name>Primary Maintainer</name>
 </maintainer>
+<longdescription>a root filesytem using the embedded c library - uclibc</longdescription>
 </pkgmetadata>
diff --git a/sys-devel/uclibc-buildroot/uclibc-buildroot-20040131.ebuild b/sys-devel/uclibc-buildroot/uclibc-buildroot-20040218.ebuild
index 2427b195e036..c39f40e40b6b 100644
--- a/sys-devel/uclibc-buildroot/uclibc-buildroot-20040131.ebuild
+++ b/sys-devel/uclibc-buildroot/uclibc-buildroot-20040218.ebuild
@@ -1,34 +1,41 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/uclibc-buildroot/uclibc-buildroot-20040131.ebuild,v 1.4 2004/02/05 06:14:56 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/uclibc-buildroot/uclibc-buildroot-20040218.ebuild,v 1.1 2004/02/20 02:24:11 dragonheart Exp $
 
 inherit eutils crosscompile
 
+
 # Derived from gcc-3_3.mk and binutils.mk
-GCCVER=3.3.2
-BINUTILSVER=2.14.90.0.6
+GCCVER=3.3.3
+BINUTILSVER=2.14.90.0.8
 UCLIBCVER=0.9.26
-BUSYBOXVER=1.00-pre6
+BUSYBOXVER=1.00-pre7
 TINYLOGINVER=1.4
+KERNELHEADERSVER=2.4.25
 
 DESCRIPTION="Embedded root file system"
 HOMEPAGE="http://www.uclibc.org/"
-SRC_URI="mirror://gnu/gcc/gcc-${GCCVER}/gcc-${GCCVER}.tar.bz2
+SRC_URI="http://gcc.get-software.com/releases/gcc-${GCCVER}.tar.bz2
 	http://dev.gentoo.org/~dragonheart/buildroot-${PV}.tar.bz2
 	mirror://kernel/linux/devel/binutils/binutils-${BINUTILSVER}.tar.bz2
-	mirror://kernel/linux/libs/uclibc/toolchain/kernel-headers-2.4.21.tar.bz2
+	mirror://kernel/linux/libs/uclibc/toolchain/kernel-headers-${KERNELHEADERSVER}.tar.bz2
 	mirror://kernel/linux/libs/uclibc/uClibc-${UCLIBCVER}.tar.bz2
-	nls? ( mirror://kernel/linux/libs/uclibc/uClibc-locale-030818.tgz )
 	nommu? ( mirror://kernel/linux/libs/uclibc/toolchain/elf2flt-20030620.tar.bz2 )
 	debug? ( http://www.busybox.net/downloads/busybox-${BUSYBOXVER}.tar.bz2 )
 	debug? ( http://tinylogin.busybox.net/downloads/tinylogin-${TINYLOGINVER}.tar.bz2 )
 	softfloat? ( mirror://debian/pool/main/libf/libfloat/libfloat_990616.orig.tar.gz )
 	softfloat? ( mirror://debian/pool/main/libf/libfloat/libfloat_990616-3.diff.gz )"
 
-# TODO pregen local is only x86
-#nls? ( x86? ( mirror://kernel/linux/libs/uclibc/uClibc-locale-030818.tgz ) )
+# gcc-3/3/3 hasn't hit all mirrors yet.
+#mirror://gnu/gcc/gcc-${GCCVER}/gcc-${GCCVER}.tar.bz2
+
+# Not using pregen  locale for the time being.
+#	nls? ( mirror://kernel/linux/libs/uclibc/uClibc-locale-030818.tgz )
+#
 #
 # nested SRC_URI are not supported until portage-2.0.50pre19 bug #16159
+# will stuff up if FEATURES="cvs" is set.
+# nls? ( x86? ( mirror://kernel/linux/libs/uclibc/uClibc-locale-030818.tgz ) )
 
 RESTRICT="nomirror"
 
@@ -187,7 +194,7 @@ src_unpack() {
 
 	# these hacks affect the search path of the uclibc-toolchain to prevent
 	# leakage of gcclibs into the target
-#-e "/DIR2)\/\.configured/,/DIR2)\/.configured/ s/--\(.*\)=\$(STAGING_DIR)/--\1=\/usr\/${TARGETARCH}-uclibc/g" \
+#-e "/DIR2)\/\.configured/,/DIR2)\/.configured/ s/--\(.*\)=\$(STAGING_DIR)/--\1=\/usr\/${TARGETARCH}-uclibc/g"
 
 	sed -i \
 -e "/DIR2)\/\.installed:/,/\.installed/ s/\$(MAKE)/\$(MAKE) DESTDIR=\$(STAGING_DIR)/" \
@@ -198,10 +205,11 @@ src_unpack() {
 
 	sed -i -e 's#cp -fa#cp --preserve=mode -dPRf#g' ${UCLIBCDIR}/Makefile
 
+	# sed -i -e "s/2.14.90.0.8/${BINUTILSVER}/g" make/binutils.mk
 	cd ${UCLIBCDIR}
 	local patches="uClibc-0.9.26-Makefile.patch"
 
-	#[ `use pie` && ${TARGETARCH}=="i386" ] && patches="${patches} uClibc-${PV}-pie-option.patch"
+	#[ `use pie` && ${TARGETARCH} == "i386" ] && patches="${patches} uClibc-${PV}-pie-option.patch"
 
 	for patch in ${patches} ; do
 		[ -f ${FILESDIR}/${UCLIBCVER}/${patch} ] && epatch ${FILESDIR}/${UCLIBCVER}/${patch}
@@ -228,7 +236,7 @@ src_compile() {
 
 
 	# restore last config
-	if [ -f /etc/embedded/uClibc.config && `use savedconfig` ]; then
+	if [ -f /etc/embedded/uClibc.config ] && use savedconfig; then
 		cp /etc/embedded/uClibc.config ${uconfig}
 	else
 		# or make the default with a few changes
@@ -253,10 +261,10 @@ src_compile() {
 		uclibc_config_option y UNIX98PTY_ONLY
 		uclibc_config_option n UCLIBC_HAS_TZ_FILE_READ_MANY
 		uclibc_config_option y UCLIBC_HAS_LFS
-		uclibc_config_option y UCLIBC_COMPLETELY_PIC
+		use pie && uclibc_config_option y UCLIBC_COMPLETELY_PIC
 
 
-		if [ `use debug` ]; then
+		if use debug; then
 			uclibc_config_option y DODEBUG
 			uclibc_config_option y PTHREADS_DEBUG_SUPPORT
 			uclibc_config_option y CONFIG_PROFILING
@@ -280,7 +288,7 @@ src_compile() {
 			uclibc_config_option y UCLIBC_HAS_MMU
 
 
-		if [ `use pie` && ${TARGETARCH}=="i386" ]; then
+		if [ `use pie` ] && ${TARGETARCH} == "i386"; then
 			uclibc_config_option y UCLIBC_PIE_SUPPORT
 			uclibc_config_option n CONFIG_PROFILING
 		else
@@ -290,7 +298,7 @@ src_compile() {
 		use propolice && uclibc_config_option y UCLIBC_PROPOLICE || \
 			uclibc_config_option n UCLIBC_PROPOLICE
 
-		if [ `use softfloat` ]; then
+		if use softfloat; then
 			uclibc_config_option n HAS_FPU
 			uclibc_config_option y UCLIBC_HAS_FLOATS
 			uclibc_config_option y UCLIBC_HAS_SOFT_FLOAT
@@ -302,14 +310,14 @@ src_compile() {
 		uclibc_config_option n UCLIBC_PREGENERATED_LOCALE_DATA
 		uclibc_config_option n UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA
 
-		if [ `use nls` ]; then
+		if use nls; then
 			uclibc_config_option y UCLIBC_HAS_LOCALE
 
 			#pregen is for i386 architectures only
-			if [ ${TARGETARCH}=="i386" ]; then
-				uclibc_config_option y UCLIBC_PREGENERATED_LOCALE_DATA
-				cp ${DISTDIR}/uClibc-locale-030818.tgz ${UCLIBCDIR}/extra/locale
-			else
+			#if [ ${TARGETARCH} == "i386" ]; then
+			#	uclibc_config_option y UCLIBC_PREGENERATED_LOCALE_DATA
+			#	cp ${DISTDIR}/uClibc-locale-030818.tgz ${UCLIBCDIR}/extra/locale
+			#else
 				uclibc_config_option n UCLIBC_PREGENERATED_LOCALE_DATA
 
 				#TODO - below needs to be done for savedconfig too
@@ -318,7 +326,7 @@ src_compile() {
 				cp LOCALES locales.txt
 				emake clean all || die "Could not generate codepages"
 				popd
-			fi
+			#fi
 			uclibc_config_option y UCLIBC_HAS_XLOCALE
 			uclibc_config_option y UCLIBC_HAS_HEXADECIMAL_FLOATS
 			uclibc_config_option y UCLIBC_HAS_GLIBC_DIGIT_GROUPING
@@ -343,8 +351,8 @@ src_compile() {
 	cd ${S}
 	emake -j1 || die "Could not make uclibc-buildroot"
 
-	if [ `use debug` ]; then
-		if [ -f /etc/embedded/busybox.config && `use savedconfig` ]; then
+	if use debug; then
+		if [ -f /etc/embedded/busybox.config } && use savedconfig; then
 			emake BUSYBOX_CONFIG=/etc/embedded/busybox.config busybox \
 				|| "Error making busybox old config"
 		else
@@ -417,4 +425,4 @@ src_install() {
 	[ -f ${S}/build_${TARGETARCH}/tinylogin-${TINYLOGINVER}/Config.h ] && \
 		cp ${S}/build_${TARGETARCH}/tinylogin-${TINYLOGINVER}/Config.h ${D}/etc/embedded/tinylogin.config
 
-}
\ No newline at end of file
+}