merge of '20f065690e4d1d9b912ff2b9ea74cb4ec5bfa58e'

     and '54848140214b3d180243cd747004c124b89af382'

4 files changed, 52 insertions, 4 deletions

diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index 9d54de8748..b4bd21ab25 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -11,7 +11,7 @@ inherit qmake
 
 # special case for DISTRO = sharprom
 CPP_SUPPORT_LIB = "LIBS-=-lstdc++ LIBS+=-lsupc++"
-CPP_SUPPORT_LIB_sharprom = "LIBS-=-lstdc++"
+CPP_SUPPORT_LIB_sharprom-compatible = "LIBS+=-lstdc++"
 EXTRA_QMAKEVARS_POST += "DEFINES+=QWS CONFIG+=qt ${CPP_SUPPORT_LIB}"
 EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "CONFIG-=thread",d)}'
 EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index da050eb2db..dfdb4b9375 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.1"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "16"
+DISTRO_REVISION = "18"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -134,7 +134,7 @@ PREFERRED_PROVIDER_libxss = "libxss"
 
 
 #EABI stuff
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 
@@ -158,6 +158,7 @@ PREFERRED_VERSION_glibc ?= "2.5"
 
 PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
+PREFERRED_VERSION_glibc-initial ?= "2.5"
 
 # To use an EABI compatible version 3 series gcc, either uncomment 
 # the lines below or set them in local.conf: 
diff --git a/packages/fetchmail/fetchmail_6.2.5.bb b/packages/fetchmail/fetchmail_6.2.5.bb
index 237801549f..2a81319085 100644
--- a/packages/fetchmail/fetchmail_6.2.5.bb
+++ b/packages/fetchmail/fetchmail_6.2.5.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 SECTION = "console/network"
 LICENSE = "GPL"
 DESCRIPTION = "Fetchmail is a free, full-featured, robust, \
@@ -16,6 +16,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
 
 inherit autotools gettext
 
+FULL_OPTIMIZATION_sharprom-compatible = "-fexpensive-optimizations -fomit-frame-pointer -O1"
+
 do_configure_prepend () {
 	if [ ! -e acinclude.m4 ]; then
 		cat aclocal.m4 > acinclude.m4
diff --git a/packages/glibc/glibc-initial_2.5.bb b/packages/glibc/glibc-initial_2.5.bb
new file mode 100644
index 0000000000..f13419a413
--- /dev/null
+++ b/packages/glibc/glibc-initial_2.5.bb
@@ -0,0 +1,45 @@
+require glibc_${PV}.bb
+
+DEPENDS = "linux-libc-headers"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+PACKAGES = ""
+
+do_configure () {
+	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
+	chmod +x ${S}/configure
+	CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+		--without-cvs --disable-sanity-checks \
+		--with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
+		--enable-hacker-mode
+	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
+		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
+		# Another workaround might be to tell configure to not use any cross options to $(CC).
+		# The real fix would be to get install-headers to not generate errlist-compat.c.
+		make sysdeps/gnu/errlist.c
+		mkdir -p stdio-common
+		touch stdio-common/errlist-compat.c
+	fi
+}
+
+do_compile () {
+	:
+}
+
+do_stage () {
+	oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+
+	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
+	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
+	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
+	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
+	touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
+	cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+}
+
+do_install () {
+	:
+}