Merge openembedded@openembedded.bkbits.net:packages

into direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/packages

2004/01/28 20:06:18-06:00 ti.com!kergoth
Correct bindir and sbindir for usbutils.

2004/01/28 20:06:10-06:00 ti.com!kergoth
Correct binutils config opts for glibc tc build, and add libgcc_eh workaround.

BKrev: 40186ab4dmKQkVY2opxcGSF6mdN8Pw

6 files changed, 208 insertions, 6 deletions

diff --git a/binutils/binutils_2.14.90.0.6.oe b/binutils/binutils_2.14.90.0.6.oe
index 8442f0caa2..211291e420 100644
--- a/binutils/binutils_2.14.90.0.6.oe
+++ b/binutils/binutils_2.14.90.0.6.oe
@@ -41,12 +41,7 @@ SRC_URI := http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2
 S := ${WORKDIR}/binutils-${PV}
 B := ${S}/build.${HOST_SYS}.${TARGET_SYS}
 
-EXTRA_OECONF := --enable-targets=${TARGET_SYS} \
-                --with-sysroot=${prefix} \
-                --with-lib-path=${prefix}/lib:/lib \
-                --disable-shared \
-                --enable-multilib \
-                --program-prefix=${TARGET_PREFIX}
+EXTRA_OECONF = '--disable-nls --program-prefix=${TARGET_PREFIX}'
 
 # This is necessary due to a bug in the binutils Makefiles
 EXTRA_OEMAKE = configure-build-libiberty all
diff --git a/binutils/binutils_2.14.90.0.7.oe b/binutils/binutils_2.14.90.0.7.oe
index e69de29bb2..211291e420 100644
--- a/binutils/binutils_2.14.90.0.7.oe
+++ b/binutils/binutils_2.14.90.0.7.oe
@@ -0,0 +1,90 @@
+inherit autotools
+
+DESCRIPTION := A GNU collection of binary utilities
+LICENSE := GPL
+MAINTAINER := Gerald Britton <gbritton@doomcom.org>
+
+DEPENDS := virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc \
+           virtual/libc patcher
+
+PACKAGES = ${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks
+
+FILES_${PN} =  \
+	${bindir}/${TARGET_PREFIX}*
+
+FILES_${PN}-dev = \
+	${includedir} \
+	${libdir}/*.a
+
+FILES_${PN}-symlinks = \
+	${bindir}/addr2line \
+	${bindir}/ar \
+	${bindir}/as \
+	${bindir}/ld \
+	${bindir}/nm \
+	${bindir}/objcopy \
+	${bindir}/objdump \
+	${bindir}/ranlib \
+	${bindir}/readelf \
+	${bindir}/size \
+	${bindir}/strings \
+	${bindir}/strip
+
+SRC_URI := http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+           file://${FILESDIR}/binutils-001_ld_makefile.patch;patch=1 \
+           file://${FILESDIR}/binutils-006_better_file_error.patch;patch=1 \
+           file://${FILESDIR}/binutils-009_signed_char_fix.patch;patch=1 \
+           file://${FILESDIR}/binutils-012_check_ldrunpath_length.patch;patch=1 \
+           file://${FILESDIR}/binutils-100_cflags_for_build.patch;patch=1 \
+           file://${FILESDIR}/binutils-906-hjl_libtool_dso.patch;patch=1
+
+S := ${WORKDIR}/binutils-${PV}
+B := ${S}/build.${HOST_SYS}.${TARGET_SYS}
+
+EXTRA_OECONF = '--disable-nls --program-prefix=${TARGET_PREFIX}'
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = configure-build-libiberty all
+
+export AR = ${HOST_PREFIX}ar
+export AS = ${HOST_PREFIX}as
+export LD = ${HOST_PREFIX}ld
+export NM = ${HOST_PREFIX}nm
+export RANLIB = ${HOST_PREFIX}ranlib
+export OBJCOPY = ${HOST_PREFIX}objcopy
+export OBJDUMP = ${HOST_PREFIX}objdump
+
+export AR_FOR_TARGET = ${TARGET_PREFIX}ar
+export AS_FOR_TARGET = ${TARGET_PREFIX}as
+export LD_FOR_TARGET = ${TARGET_PREFIX}ld
+export NM_FOR_TARGET = ${TARGET_PREFIX}nm
+export RANLIB_FOR_TARGET = ${TARGET_PREFIX}ranlib
+
+export CC_FOR_HOST = ${CCACHE} ${HOST_PREFIX}gcc
+export CXX_FOR_HOST = ${CCACHE} ${HOST_PREFIX}gcc
+
+export CC_FOR_BUILD = ${BUILD_CC}
+
+export CC = ${CCACHE} ${HOST_PREFIX}gcc
+
+do_configure () {
+	oe_runconf
+}
+
+do_install () {
+	autotools_do_install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${D}/${libdir}/ldscripts
+
+	# Install the libiberty header
+	install -m 644 ${S}/include/ansidecl.h ${D}/${includedir}
+	install -m 644 ${S}/include/libiberty.h ${D}/${includedir}
+
+	cd ${D}/${bindir}
+
+	# Symlinks for ease of running these on the native target
+	for p in ${TARGET_SYS}-* ; do
+		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+	done
+}
diff --git a/binutils/binutils_2.14.90.0.8.oe b/binutils/binutils_2.14.90.0.8.oe
index e69de29bb2..2fa6068286 100644
--- a/binutils/binutils_2.14.90.0.8.oe
+++ b/binutils/binutils_2.14.90.0.8.oe
@@ -0,0 +1,89 @@
+inherit autotools
+
+DESCRIPTION := A GNU collection of binary utilities
+LICENSE := GPL
+MAINTAINER := Gerald Britton <gbritton@doomcom.org>
+
+DEPENDS := virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc \
+           virtual/libc patcher
+
+PACKAGES = ${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks
+
+FILES_${PN} =  \
+	${bindir}/${TARGET_PREFIX}*
+
+FILES_${PN}-dev = \
+	${includedir} \
+	${libdir}/*.a
+
+FILES_${PN}-symlinks = \
+	${bindir}/addr2line \
+	${bindir}/ar \
+	${bindir}/as \
+	${bindir}/ld \
+	${bindir}/nm \
+	${bindir}/objcopy \
+	${bindir}/objdump \
+	${bindir}/ranlib \
+	${bindir}/readelf \
+	${bindir}/size \
+	${bindir}/strings \
+	${bindir}/strip
+
+SRC_URI := http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+           file://${FILESDIR}/binutils-001_ld_makefile.patch;patch=1 \
+           file://${FILESDIR}/binutils-006_better_file_error.patch;patch=1 \
+           file://${FILESDIR}/binutils-009_signed_char_fix.patch;patch=1 \
+           file://${FILESDIR}/binutils-012_check_ldrunpath_length.patch;patch=1 \
+           file://${FILESDIR}/binutils-100_cflags_for_build.patch;patch=1
+
+S := ${WORKDIR}/binutils-${PV}
+B := ${S}/build.${HOST_SYS}.${TARGET_SYS}
+
+EXTRA_OECONF = '--disable-nls --program-prefix=${TARGET_PREFIX}'
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = configure-build-libiberty all
+
+export AR = ${HOST_PREFIX}ar
+export AS = ${HOST_PREFIX}as
+export LD = ${HOST_PREFIX}ld
+export NM = ${HOST_PREFIX}nm
+export RANLIB = ${HOST_PREFIX}ranlib
+export OBJCOPY = ${HOST_PREFIX}objcopy
+export OBJDUMP = ${HOST_PREFIX}objdump
+
+export AR_FOR_TARGET = ${TARGET_PREFIX}ar
+export AS_FOR_TARGET = ${TARGET_PREFIX}as
+export LD_FOR_TARGET = ${TARGET_PREFIX}ld
+export NM_FOR_TARGET = ${TARGET_PREFIX}nm
+export RANLIB_FOR_TARGET = ${TARGET_PREFIX}ranlib
+
+export CC_FOR_HOST = ${CCACHE} ${HOST_PREFIX}gcc
+export CXX_FOR_HOST = ${CCACHE} ${HOST_PREFIX}gcc
+
+export CC_FOR_BUILD = ${BUILD_CC}
+
+export CC = ${CCACHE} ${HOST_PREFIX}gcc
+
+do_configure () {
+	oe_runconf
+}
+
+do_install () {
+	autotools_do_install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${D}/${libdir}/ldscripts
+
+	# Install the libiberty header
+	install -m 644 ${S}/include/ansidecl.h ${D}/${includedir}
+	install -m 644 ${S}/include/libiberty.h ${D}/${includedir}
+
+	cd ${D}/${bindir}
+
+	# Symlinks for ease of running these on the native target
+	for p in ${TARGET_SYS}-* ; do
+		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+	done
+}
diff --git a/gcc/gcc-cross_3.3.2.oe b/gcc/gcc-cross_3.3.2.oe
index 96014176d0..f5534168cf 100644
--- a/gcc/gcc-cross_3.3.2.oe
+++ b/gcc/gcc-cross_3.3.2.oe
@@ -27,6 +27,7 @@ do_configure () {
 	export RANLIB="${TARGET_SYS}-ranlib"
 	export LD="${TARGET_SYS}-ld"
 	export NM="${TARGET_SYS}-nm"
+	rm -f ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/3.3.2/libgcc_eh.a
 	oe_runconf
 }
 
diff --git a/gcc/gcc-initial-cross_3.3.2.oe b/gcc/gcc-initial-cross_3.3.2.oe
index d687401007..25f040d624 100644
--- a/gcc/gcc-initial-cross_3.3.2.oe
+++ b/gcc/gcc-initial-cross_3.3.2.oe
@@ -13,3 +13,8 @@ EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/local \
 		--disable-threads \
                 --enable-multilib \
                 --program-prefix=${TARGET_SYS}-
+
+do_stage_prepend () {
+	mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/3.3.2
+	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/3.3.2/libgcc_eh.a
+}
diff --git a/usbutils/usbutils_0.11.oe b/usbutils/usbutils_0.11.oe
index e69de29bb2..cfa64c5402 100644
--- a/usbutils/usbutils_0.11.oe
+++ b/usbutils/usbutils_0.11.oe
@@ -0,0 +1,22 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = http://wwwbode.cs.tum.edu/Par/arch/usb/download/usbutils/usbutils-${PV}.tar.gz \
+	  file://${FILESDIR}/configure.patch;patch=1
+S = ${WORKDIR}/usbutils-${PV}
+
+inherit autotools libtool
+EXTRA_OECONF=--program-prefix=
+sbindir=/sbin
+bindir=/bin
+
+libusb_remove () {
+	cd ${S}
+	rm -rf libusb
+}
+
+python do_unpack () {
+	oe.build.exec_func('base_do_unpack', d)
+	oe.build.exec_func('libusb_remove', d)
+}
+