merge of '3bc048bb553b64eaf0567c44a7b375930a42b5af'

     and '64cb3a9bf1c0275166bc2bd9550ea0eec67a60b6'

5 files changed, 123 insertions, 0 deletions

diff --git a/packages/glibc/eglibc-initial_svn.bb b/packages/glibc/eglibc-initial_svn.bb
new file mode 100644
index 0000000000..02ba4c6273
--- /dev/null
+++ b/packages/glibc/eglibc-initial_svn.bb
@@ -0,0 +1,46 @@
+require eglibc_${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
+	unset CFLAGS
+	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 () {
+	:
+}
diff --git a/packages/glibc/eglibc-intermediate_svn.bb b/packages/glibc/eglibc-intermediate_svn.bb
new file mode 100644
index 0000000000..c26f649031
--- /dev/null
+++ b/packages/glibc/eglibc-intermediate_svn.bb
@@ -0,0 +1,19 @@
+require eglibc_${PV}.bb
+
+do_install () {
+	:
+}
+
+# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
+do_configure_prepend() {
+	sed -i s:-Werror:: ${S}/configure
+}
+
+
+
+PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
+GLIBC_ADDONS = "nptl,ports"
+GLIBC_EXTRA_OECONF = ""
diff --git a/packages/maemo3/osso-ic-oss/.mtn2git_empty b/packages/maemo3/osso-ic-oss/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo3/osso-ic-oss/.mtn2git_empty
diff --git a/packages/maemo3/osso-ic-oss/dbus-api-update.patch b/packages/maemo3/osso-ic-oss/dbus-api-update.patch
new file mode 100644
index 0000000000..425f959d79
--- /dev/null
+++ b/packages/maemo3/osso-ic-oss/dbus-api-update.patch
@@ -0,0 +1,33 @@
+--- /tmp/osso-iap-connect.c	2007-08-07 12:06:51.000000000 +0200
++++ osso-ic-oss-1.0.4/examples/osso-iap-connect.c	2007-08-07 12:07:32.698400000 +0200
+@@ -276,7 +276,7 @@
+ 	g_main_loop_run(ctxt.loop);
+ 
+ 	/* Clean up */
+-	dbus_connection_disconnect(conn);
++	dbus_connection_close(conn);
+ 	dbus_connection_unref(conn);
+ 
+ 	g_main_loop_unref(ctxt.loop);
+--- /tmp/ic-compat-preload.c	2007-08-07 12:06:57.000000000 +0200
++++ osso-ic-oss-1.0.4/src/ic-compat-preload.c	2007-08-07 12:07:40.268400000 +0200
+@@ -140,7 +140,7 @@
+ 			return NULL;
+ 
+ 		if (!dbus_bus_register(connection, NULL)) {
+-			dbus_connection_disconnect(connection);
++			dbus_connection_close(connection);
+ 			dbus_connection_unref(connection);
+ 			connection = NULL;
+ 			return NULL;
+--- /tmp/ic-api.c	2007-08-07 12:06:57.000000000 +0200
++++ osso-ic-oss-1.0.4/src/ic-api.c	2007-08-07 12:07:55.628400000 +0200
+@@ -145,7 +145,7 @@
+ 		if (dbus_connection_register_object_path(
+ 				connection, ICD_DBUS_PATH,
+ 				&icd_vtable, arg) == FALSE) {
+-			dbus_connection_disconnect(connection);
++			dbus_connection_close(connection);
+ 			dbus_connection_unref(connection);
+ 			connection = NULL;
+ 			return NULL;
diff --git a/packages/maemo3/osso-ic-oss_1.0.4.bb b/packages/maemo3/osso-ic-oss_1.0.4.bb
new file mode 100644
index 0000000000..4f9b742fb7
--- /dev/null
+++ b/packages/maemo3/osso-ic-oss_1.0.4.bb
@@ -0,0 +1,25 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia osso-ic library"
+
+DEPENDS = "dbus-glib glib-2.0 outo libosso"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz \
+           file://dbus-api-update.patch;patch=1 "
+
+inherit autotools pkgconfig lib_package
+
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.ac
+}
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+        autotools_stage_all
+}
+
+