Numerous build fixes from an oemake -a run, including two more fixes for libtool 'libdir from .la file leaking into library search path' situations.

BKrev: 3fbe5902eywlLRHkRQ1FaDS5C01-jg

62 files changed, 24323 insertions, 60 deletions

diff --git a/alsa-utils/alsa-utils_0.9.8.oe b/alsa-utils/alsa-utils_0.9.8.oe
index e69de29bb2..8ae86cd5b6 100644
--- a/alsa-utils/alsa-utils_0.9.8.oe
+++ b/alsa-utils/alsa-utils_0.9.8.oe
@@ -0,0 +1,8 @@
+DESCRIPTION="Alsa Utilities"
+MAINTAINER="Lorn Potter <lpotter@trolltech.com>"
+LICENSE="GPL"
+DEPENDS="virtual/libc"
+
+SRC_URI="ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
+
+inherit autotools
diff --git a/binutils/binutils_2.14.90.0.6.oe b/binutils/binutils_2.14.90.0.6.oe
index 7578e0e110..d028e6cf4c 100644
--- a/binutils/binutils_2.14.90.0.6.oe
+++ b/binutils/binutils_2.14.90.0.6.oe
@@ -61,6 +61,10 @@ python do_patch () {
 	oe.build.exec_func('binutilsbuild_do_patch', d)
 }
 
+do_configure () {
+	oe_runconf
+}
+
 do_install () {
 	autotools_do_install
 	cd ${D}/${bindir}
diff --git a/alsa-tools/alsa-tools_0.9.8.oe b/bison/bison-1.875/m4.patch
index e69de29bb2..e69de29bb2 100644
--- a/alsa-tools/alsa-tools_0.9.8.oe
+++ b/bison/bison-1.875/m4.patch
diff --git a/bison/bison_1.875.oe b/bison/bison_1.875.oe
index e69de29bb2..21f773340e 100644
--- a/bison/bison_1.875.oe
+++ b/bison/bison_1.875.oe
@@ -0,0 +1,7 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = ${GNU_MIRROR}/bison/bison-${PV}.tar.bz2 \
+	  file://${FILESDIR}/m4.patch;patch=1
+
+inherit autotools
diff --git a/bluez-hcidump/bluez-hcidump-1.5/configure.patch b/bluez-hcidump/bluez-hcidump-1.5/configure.patch
index e69de29bb2..fe40bfb3ad 100644
--- a/bluez-hcidump/bluez-hcidump-1.5/configure.patch
+++ b/bluez-hcidump/bluez-hcidump-1.5/configure.patch
@@ -0,0 +1,29 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- bluez-hcidump-1.5/configure.in~configure
++++ bluez-hcidump-1.5/configure.in
+@@ -24,8 +24,8 @@
+ AC_ARG_WITH(bluez-libs,
+ 	--with-bluez-libs=DIR  BlueZ libraries and header files,
+ 	[
+-	    BLUEZ_INCDIR="$withval"/include
+-	    BLUEZ_LIBDIR="$withval"/src
++	    BLUEZ_INCDIR="$withval/include $withval/include/bluetooth"
++	    BLUEZ_LIBDIR="$withval"/lib
+ 	],[
+ 	    BLUEZ_INCDIR='../libs/include /usr/include/bluetooth'
+ 	    BLUEZ_LIBDIR='../libs/src /usr/lib'
+--- bluez-hcidump-1.5/acinclude.m4~configure
++++ bluez-hcidump-1.5/acinclude.m4
+@@ -74,7 +74,7 @@
+ 	p=`cd $p && pwd`
+ 
+ 	# Check for libtool library
+-	if test -f $p/lib$1.la; then
++	if test -f $p/lib$1.la -a -d $p/.libs; then
+ 		path=$p/.libs
+ 	else
+ 		path=$p
diff --git a/bluez-hcidump/bluez-hcidump_1.5.oe b/bluez-hcidump/bluez-hcidump_1.5.oe
index e69de29bb2..aa8f25f932 100644
--- a/bluez-hcidump/bluez-hcidump_1.5.oe
+++ b/bluez-hcidump/bluez-hcidump_1.5.oe
@@ -0,0 +1,13 @@
+SECTION="libs"
+PRIORITY="optional"
+RDEPENDS="libc6"
+SECTION="libs"
+DEPENDS=virtual/libc virtual/libbluetooth
+
+SRC_URI = http://bluez.sourceforge.net/download/${PN}-${PV}.tar.gz \
+	  file://${FILESDIR}/configure.patch;patch=1
+S=${WORKDIR}/${P}
+
+EXTRA_OECONF:="--with-bluez-libs=${STAGING_DIR}/target"
+
+inherit autotools libtool
diff --git a/bluez-libs/bluez-libs_2.4.oe b/bluez-libs/bluez-libs_2.4.oe
index 511825048e..6b54785371 100644
--- a/bluez-libs/bluez-libs_2.4.oe
+++ b/bluez-libs/bluez-libs_2.4.oe
@@ -23,6 +23,5 @@ do_stage () {
 	do
 		install -m 0644 include/${X} ${STAGING_DIR}/target/include/bluetooth/${X}
 	done
-
+	install -m 0644 src/.libs/libbluetooth.lai ${STAGING_LIBDIR}/libbluetooth.la
 }
-
diff --git a/bluez-sdp/bluez-sdp_1.5.oe b/bluez-sdp/bluez-sdp_1.5.oe
index e69de29bb2..f9e6a3fb87 100644
--- a/bluez-sdp/bluez-sdp_1.5.oe
+++ b/bluez-sdp/bluez-sdp_1.5.oe
@@ -0,0 +1,30 @@
+SECTION="libs"
+PRIORITY="optional"
+RDEPENDS="libc6"
+SECTION="libs"
+DEPENDS=virtual/libc virtual/libbluetooth
+PROVIDES=virtual/libsdp
+
+SRC_URI = "http://bluez.sourceforge.net/download/${PN}-${PV}.tar.gz"
+S=${WORKDIR}/${P}
+
+EXTRA_OECONF:="--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_DIR}/target/include"
+LDFLAGS_prepend = "-L${S}/libs "
+
+inherit autotools libtool
+
+do_stage () {
+	install -m 0644 libs/.libs/libsdp.a ${STAGING_LIBDIR}/
+	install -m 0644 libs/.libs/libsdp.lai ${STAGING_LIBDIR}/libsdp.la
+	install -m 0755 libs/.libs/libsdp.so.2.0.1 ${STAGING_LIBDIR}/
+
+	ln -sf ${STAGING_LIBDIR}/libsdp.so.2.0.1 ${STAGING_LIBDIR}/libsdp.so.2
+	ln -sf ${STAGING_LIBDIR}/libsdp.so.2.0.1 ${STAGING_LIBDIR}/libsdp.so
+
+	for X in sdp.h sdp_lib.h
+	do
+		install -m 0644 include/${X} ${STAGING_DIR}/target/include/bluetooth/${X}
+	done
+
+}
+
diff --git a/python/python-2.3.2/bindir-libdir.patch b/bluez-utils/bluez-utils-2.3/configure.patch
index e69de29bb2..e69de29bb2 100644
--- a/python/python-2.3.2/bindir-libdir.patch
+++ b/bluez-utils/bluez-utils-2.3/configure.patch
diff --git a/bluez-utils/bluez-utils_2.3.oe b/bluez-utils/bluez-utils_2.3.oe
index e69de29bb2..b7846ca54e 100644
--- a/bluez-utils/bluez-utils_2.3.oe
+++ b/bluez-utils/bluez-utils_2.3.oe
@@ -0,0 +1,12 @@
+SECTION="libs"
+PRIORITY="optional"
+RDEPENDS="libc6"
+SECTION="libs"
+DEPENDS=virtual/libc virtual/libbluetooth
+
+SRC_URI = "http://bluez.sourceforge.net/download/${PN}-${PV}.tar.gz \
+	   file://${FILESDIR}/configure.patch;patch=1"
+
+EXTRA_OECONF:="--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_DIR}/target/include"
+
+inherit autotools libtool
diff --git a/resolvconf/resolvconf_0.41.oe b/centericq/centericq-4.9.7/m4.patch
index e69de29bb2..e69de29bb2 100644
--- a/resolvconf/resolvconf_0.41.oe
+++ b/centericq/centericq-4.9.7/m4.patch
diff --git a/centericq/centericq_4.9.7.oe b/centericq/centericq_4.9.7.oe
index e69de29bb2..03917c8fde 100644
--- a/centericq/centericq_4.9.7.oe
+++ b/centericq/centericq_4.9.7.oe
@@ -0,0 +1,10 @@
+DEPENDS = virtual/libc openssl ncurses
+RDEPENDS = libc6 openssl ncurses
+
+SRC_URI = http://thekonst.net/download/centericq-4.9.7.tar.bz2 \
+	  file://${FILESDIR}/configure.patch;patch=1 \
+	  file://${FILESDIR}/m4.patch;patch=1
+
+inherit autotools
+
+EXTRA_OECONF = '--with-ssl --with-openssl=${STAGING_DIR}/target'
diff --git a/vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch b/e2fsprogs-libs/e2fsprogs-libs-1.34/ldflags.patch
index e69de29bb2..e69de29bb2 100644
--- a/vpnc/vpnc-0.2-rm+zomb-pre6/attribute.patch
+++ b/e2fsprogs-libs/e2fsprogs-libs-1.34/ldflags.patch
diff --git a/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch b/e2fsprogs-libs/e2fsprogs-libs-1.34/m4.patch
index e69de29bb2..e69de29bb2 100644
--- a/xfree86/xfree86-4.3.0/dirty-3.2-xterm-breakage-fix.patch
+++ b/e2fsprogs-libs/e2fsprogs-libs-1.34/m4.patch
diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.34.oe b/e2fsprogs-libs/e2fsprogs-libs_1.34.oe
index 3ff5916bb4..60eb2ebb52 100644
--- a/e2fsprogs-libs/e2fsprogs-libs_1.34.oe
+++ b/e2fsprogs-libs/e2fsprogs-libs_1.34.oe
@@ -7,12 +7,16 @@ DEPENDS=virtual/libc
 
 SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
 	file://${FILESDIR}/configure.patch;patch=1 \
-	file://${FILESDIR}/compile-subst.patch;patch=1
+	file://${FILESDIR}/compile-subst.patch;patch=1 \
+	file://${FILESDIR}/m4.patch;patch=1 \
+	file://${FILESDIR}/ldflags.patch;patch=1
 
 inherit autotools
 
+EXTRA_OECONF='--with-ldopts="${LDFLAGS}"'
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
+	( cd util; ${BUILD_CC} subst.c -o subst )
 }
 
 do_stage () {
diff --git a/xfree86/xfree86-4.3.0/host.def b/e2fsprogs/e2fsprogs-1.34/e2fsprogs_1.34.oe
index e69de29bb2..e69de29bb2 100644
--- a/xfree86/xfree86-4.3.0/host.def
+++ b/e2fsprogs/e2fsprogs-1.34/e2fsprogs_1.34.oe
diff --git a/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch b/e2fsprogs/e2fsprogs-1.34/ldflags.patch
index e69de29bb2..e69de29bb2 100644
--- a/xfree86/xfree86-4.3.0/tinyx-kbd-enable-fix.patch
+++ b/e2fsprogs/e2fsprogs-1.34/ldflags.patch
diff --git a/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch b/e2fsprogs/e2fsprogs-1.34/m4.patch
index e69de29bb2..e69de29bb2 100644
--- a/xfree86/xfree86-4.3.0/tinyx-tslib-reset-and-vt-switch-fixes.patch
+++ b/e2fsprogs/e2fsprogs-1.34/m4.patch
diff --git a/e2fsprogs/e2fsprogs_1.34.oe b/e2fsprogs/e2fsprogs_1.34.oe
index e69de29bb2..7a3735a0bb 100644
--- a/e2fsprogs/e2fsprogs_1.34.oe
+++ b/e2fsprogs/e2fsprogs_1.34.oe
@@ -0,0 +1,21 @@
+DESCRIPTION="EXT2 Filesystem Utilities"
+SECTION="base"
+PRIORITY="optional"
+MAINTAINER="Greg Gilbert <greg@treke.net>"
+RDEPENDS="libc6"
+DEPENDS=virtual/libc 
+
+SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
+	file://${FILESDIR}/ln.patch;patch=1 \
+	file://${FILESDIR}/configure.patch;patch=1 \
+	file://${FILESDIR}/compile-subst.patch;patch=1 \
+	file://${FILESDIR}/m4.patch;patch=1 \
+	file://${FILESDIR}/ldflags.patch;patch=1
+
+inherit autotools
+
+EXTRA_OECONF='--with-ldopts="${LDFLAGS}"'
+do_compile_prepend () {
+	find ./ -print|xargs chmod u=rwX
+	( cd util; ${BUILD_CC} subst.c -o subst )
+}
diff --git a/fakeroot/fakeroot-native_0.7.8.oe b/fakeroot/fakeroot-native_0.7.8.oe
index e69de29bb2..b8ed092dff 100644
--- a/fakeroot/fakeroot-native_0.7.8.oe
+++ b/fakeroot/fakeroot-native_0.7.8.oe
@@ -0,0 +1,5 @@
+SRC_URI := ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz
+S = ${WORKDIR}/fakeroot-${PV}
+
+inherit autotools
+inherit native
diff --git a/xfree86/xfree86_4.3.0.oe b/findutils/findutils-4.1.20/m4.patch
index e69de29bb2..e69de29bb2 100644
--- a/xfree86/xfree86_4.3.0.oe
+++ b/findutils/findutils-4.1.20/m4.patch
diff --git a/findutils/findutils_4.1.20.oe b/findutils/findutils_4.1.20.oe
index 271a93c6f3..6e750c88a2 100644
--- a/findutils/findutils_4.1.20.oe
+++ b/findutils/findutils_4.1.20.oe
@@ -2,7 +2,8 @@ DEPENDS = virtual/libc
 RDEPENDS = libc6
 
 SRC_URI := ftp://alpha.gnu.org/gnu/findutils/findutils-4.1.20.tar.gz \
-	   file://${FILESDIR}/configure.patch;patch=1
+	   file://${FILESDIR}/configure.patch;patch=1 \
+	   file://${FILESDIR}/m4.patch;patch=1
 S := ${WORKDIR}/${P}
 
 inherit autotools
diff --git a/gcc/gcc-cross_3.3.2.oe b/gcc/gcc-cross_3.3.2.oe
index e69de29bb2..0ccdc4ef73 100644
--- a/gcc/gcc-cross_3.3.2.oe
+++ b/gcc/gcc-cross_3.3.2.oe
@@ -0,0 +1,54 @@
+include gcc_${PV}.oe
+inherit cross
+FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}
+
+DEPENDS := virtual/${TARGET_SYS}-binutils \
+           virtual/glibc virtual/glibc-headers patcher
+PROVIDES := virtual/${TARGET_SYS}-gcc \
+            virtual/${TARGET_SYS}-g++
+
+PACKAGES =
+
+EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/usr/local \
+                --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+                --enable-target-optspace \
+                --with-gnu-ld \
+                --enable-languages=c,c++ \
+                --enable-shared \
+                --enable-multilib \
+                --program-prefix=${TARGET_SYS}-
+
+export CPPFLAGS =
+export CXXFLAGS =
+export CFLAGS =
+export LDFLAGS =
+
+do_configure () {
+	export CC="${BUILD_CC}"
+	export AR="${TARGET_SYS}-ar"
+	export RANLIB="${TARGET_SYS}-ranlib"
+	export LD="${TARGET_SYS}-ld"
+	export NM="${TARGET_SYS}-nm"
+	oe_runconf
+}
+
+do_compile_prepend () {
+	export CC="${BUILD_CC}"
+	export AR_FOR_TARGET="${TARGET_SYS}-ar"
+	export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+	export LD_FOR_TARGET="${TARGET_SYS}-ld"
+	export NM_FOR_TARGET="${TARGET_SYS}-nm"
+	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
+}
+
+do_stage_append () {
+#	# Cleanup after gcc's --program-prefix failing..
+#	( cd ${CROSS_DIR}/bin ; for p in ${TARGET_SYS}-* ; do
+#		mv $p `echo $p | sed -e s,${TARGET_SYS},${TARGET_ARCH}-uclibc,`
+#	done )
+
+	rm -f ${CROSS_DIR}/bin/gccbug ${CROSS_DIR}/bin/gcov
+	for d in info man share/doc share/locale ; do
+		rm -rf ${CROSS_DIR}/$d
+	done
+}
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index af22f2e48c..c5ae1b4a3b 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -77,7 +77,21 @@ glibcbuild_do_unpack () {
 	if [ -e "${FILESDIR}/asm-${TARGET_ARCH}-unistd.h" ]; then 
 		cp -a "${FILESDIR}/asm-${TARGET_ARCH}-unistd.h" "${WORKDIR}/linux/include/asm-${TARGET_ARCH}/unistd.h"
 	fi
-	ln -sf "asm-${TARGET_ARCH}" "${WORKDIR}/linux/include/asm"
+	case "${TARGET_ARCH}" in
+	i686)
+		TARGET_ARCH=i386
+		;;
+	i586)
+		TARGET_ARCH=i386
+		;;
+	i486)
+		TARGET_ARCH=i386
+		;;
+	esac
+	if test !  -e ${WORKDIR}/linux/include/asm-$TARGET_ARCH; then
+		oefatal unable to create asm symlink in kernel headers
+	fi
+	ln -sf "asm-$TARGET_ARCH" "${WORKDIR}/linux/include/asm"
 }
 
 python do_unpack () {
@@ -119,12 +133,19 @@ do_stage() {
 	mv '${STAGING_LIBDIR}/libpthread.so' '${STAGING_LIBDIR}/libpthread-old.so'
 	cat '${STAGING_LIBDIR}/libpthread-old.so' | sed -e's,/lib/,,g' > '${STAGING_LIBDIR}/libpthread.so'
 	cp -a '${WORKDIR}/linux/include/linux' '${STAGING_DIR}/target/include/'
-	cp -a '${WORKDIR}/linux/include/asm-${TARGET_ARCH}' '${STAGING_DIR}/target/include/'
+	install -d ${STAGING_DIR}/target/include/gnu \
+		   ${STAGING_DIR}/target/include/bits
+	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_DIR}/target/include/gnu/
+	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_DIR}/target/include/bits/
 	for r in ${rpcsvc}; do
 		h=`echo $r|sed -e's,\.x$,.h,'`
 		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_DIR}/target/include/rpcsvc/
 	done
-	ln -sf 'asm-${TARGET_ARCH}' '${STAGING_DIR}/target/include/asm'
+	cp -a '${WORKDIR}/linux/include/asm' '${STAGING_DIR}/target/include/'
+	cp -a "${WORKDIR}/linux/include/`readlink ${WORKDIR}/linux/include/asm`" '${STAGING_DIR}/target/include/'
+	install -m 0644 ${B}/libc_nonshared.a ${STAGING_LIBDIR}/
+	install -m 0644 ${B}/libc_pic.a ${STAGING_LIBDIR}/
+	install -m 0644 ${B}/libc.a ${STAGING_LIBDIR}/
 }
 
 do_install() {
diff --git a/jpeg/jpeg-6b/ldflags.patch b/jpeg/jpeg-6b/ldflags.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/jpeg/jpeg-6b/ldflags.patch
diff --git a/jpeg/jpeg_6b.oe b/jpeg/jpeg_6b.oe
index e69de29bb2..abc9900624 100644
--- a/jpeg/jpeg_6b.oe
+++ b/jpeg/jpeg_6b.oe
@@ -0,0 +1,33 @@
+SECTION="libs"
+PRIORITY="required"
+MAINTAINER="Chris Larson <kergoth@handhelds.org>"
+RDEPENDS="libc6"
+DEPENDS=virtual/libc
+
+SRC_URI = http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
+	  file://${FILESDIR}/debian.patch;patch=1 \
+	  file://${FILESDIR}/ldflags.patch;patch=1
+
+inherit autotools libtool
+
+EXTRA_OECONF="--enable-static --enable-shared"
+
+CFLAGS_append = " -D_REENTRANT"
+
+do_stage() {
+	install -m 644 -D jconfig.h ${STAGING_DIR}/target/include/jconfig.h
+	install -m 644 -D jpeglib.h ${STAGING_DIR}/target/include/jpeglib.h
+	install -m 644 -D jmorecfg.h ${STAGING_DIR}/target/include/jmorecfg.h
+	install -m 644 -D jerror.h ${STAGING_DIR}/target/include/jerror.h
+	install -m 644 -D jpegint.h ${STAGING_DIR}/target/include/jpegint.h
+	install -m 755 -D .libs/libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so.62.0.0
+	ln -sf libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so.62
+	ln -sf libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so
+}
+
+do_install() {
+	install -d ${D}/${bindir} ${D}/${includedir} \
+		   ${D}/${mandir}/man1 ${D}/${libdir}
+	oe_runmake 'prefix=${D}/${prefix}' 'exec_prefix=${D}/${exec_prefix}' \
+		   install
+}
diff --git a/liblockfile/liblockfile-1.05/ldflags.patch b/liblockfile/liblockfile-1.05/ldflags.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/liblockfile/liblockfile-1.05/ldflags.patch
diff --git a/liblockfile/liblockfile_1.05.oe b/liblockfile/liblockfile_1.05.oe
index 0f9fe563a2..7e054f1ccd 100644
--- a/liblockfile/liblockfile_1.05.oe
+++ b/liblockfile/liblockfile_1.05.oe
@@ -2,8 +2,9 @@ DEPENDS = virtual/libc
 RDEPENDS = libc6
 
 SRC_URI = ${DEBIAN_MIRROR}/main/libl/libloc