merge of '19860068438a3f48413a2f40e4032ce5e8c1fe7d'

     and 'a5b842809a85562e0154b206660598c3b851094c'

11 files changed, 90 insertions, 8 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b06e2bb3d4..c9b25f7c9e 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -319,7 +319,7 @@ export palmqtdir = "/opt/QtPalmtop"
 
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
-SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
+SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net"
 GPE_MIRROR = "http://gpe.linuxtogo.org/download/source"
 GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
 XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index b49bf48d07..12f82773d4 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -19,4 +19,6 @@ ROOT_FLASH_SIZE = "32"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
 
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index d2a0e542d8..5b2c87b55c 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -6,6 +6,7 @@
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
 
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci alsa"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
index dc41e7c2fd..8fd58bb5ed 100644
--- a/conf/machine/logicpd-pxa270.conf
+++ b/conf/machine/logicpd-pxa270.conf
@@ -24,4 +24,6 @@ ROOT_FLASH_SIZE = "32"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
 
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index b2147f2c0d..91663dfd7c 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -8,7 +8,11 @@ TARGET_ARCH = "i486"
 PACKAGE_EXTRA_ARCHS = "x86"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 # todo: convert to task-base
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
+# BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
+
+MACHINE_TASK_PROVIDER = "task-base"
+
+MACHINE_FEATURES = "kernel26 pci usbhost"
 
 udevdir = "/dev"
 OLDEST_KERNEL = "2.6.17"
diff --git a/contrib/site-conf/aclocal.m4 b/contrib/site-conf/aclocal.m4
index 8d4b7eed8c..f415403d6d 100644
--- a/contrib/site-conf/aclocal.m4
+++ b/contrib/site-conf/aclocal.m4
@@ -1,2 +1,15 @@
-dnl # local file..
-m4_include(builtin.m4)
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_include([m4/builtin.m4])
+m4_include([m4/gnu.m4])
diff --git a/contrib/site-conf/configure.ac b/contrib/site-conf/configure.ac
index 0f08732a08..283008a4a7 100644
--- a/contrib/site-conf/configure.ac
+++ b/contrib/site-conf/configure.ac
@@ -6,6 +6,6 @@ AC_PREREQ([2.60])
 AC_GNU_SOURCE
 
 OE_CHECK_BUILTIN
-
+OE_CHECK_GNU
 
 AC_OUTPUT([])
diff --git a/contrib/site-conf/m4/gnu.m4 b/contrib/site-conf/m4/gnu.m4
new file mode 100644
index 0000000000..1f9331e2ef
--- /dev/null
+++ b/contrib/site-conf/m4/gnu.m4
@@ -0,0 +1,35 @@
+# Collection of binutils, gcc, glibc
+
+
+AC_DEFUN([BINUTILS_CHECK_UINT64],
+[AC_TRY_COMPILE(
+[#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif],
+[extern uint64_t foo;],
+liberty_cv_uint64=uint64_t,
+[AC_TRY_COMPILE(
+[#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifndef CHAR_BIT
+#define CHAR_BIT 8
+#endif],
+[extern char foo[sizeof(long) * CHAR_BIT >= 64 ? 1 : -1];],
+liberty_cv_uint64="unsigned long",
+[AC_TRY_COMPILE(
+[#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifndef CHAR_BIT
+#define CHAR_BIT 8
+#endif],
+[extern char foo[sizeof(long long) * CHAR_BIT >= 64 ? 1 : -1];],
+liberty_cv_uint64="unsigned long long", liberty_cv_uint64=none)])])])
+
+AC_DEFUN([OE_CHECK_GNU],
+[
+AC_CHECK_SIZEOF([int])
+AC_CHECK_TYPE(uintptr_t, unsigned long)
+BINUTILS_CHECK_UINT64
+])
diff --git a/packages/fontconfig/fontconfig_2.4.1.bb b/packages/fontconfig/fontconfig_2.4.1.bb
index 2590fed88e..098939324a 100644
--- a/packages/fontconfig/fontconfig_2.4.1.bb
+++ b/packages/fontconfig/fontconfig_2.4.1.bb
@@ -44,11 +44,29 @@ do_stage () {
 	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
 }
 
+BUILD_CFLAGS += " -I${STAGING_DIR}/${BUILD_SYS}/include/freetype2"
+
 do_configure_append () {
 	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
 	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
 	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
 	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
+
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
+
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
+
 }
 
 do_install () {
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index b0eb8d2489..5b5abf4cea 100644
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -16,9 +16,9 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 
 do_compile() {
 	(
-		unset CC LD CXX CCLD
-		oe_runmake -C src/util 'X11_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+	 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+	 cd src/util;${BUILD_CC} makekeys.c -o makekeys
 	) || exit 1
-	rm -f ${STAGING_INCDIR}/X11/Xlib.h
+		rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
 }
diff --git a/site/powerpc-linux b/site/powerpc-linux
index 5cbd9ff77c..c981adf1b4 100644
--- a/site/powerpc-linux
+++ b/site/powerpc-linux
@@ -283,3 +283,10 @@ apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes}
 
 # fnmatch
 ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
+
+# binutils (libiberty)
+ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
+ac_cv_type_int=${ac_cv_type_int=yes}
+ac_cv_type_uintptr_t=${ac_cv_type_uintptr_t=yes}
+liberty_cv_uint64=${liberty_cv_uint64=uint64_t}
+