merge of '073ad5402a8d039936fab5d043945003a8b19e1e'

     and 'eca6b7068b47ce654a33df5f448eff310501545e'

3 files changed, 77 insertions, 0 deletions

diff --git a/packages/omniorb/files/long_double.patch b/packages/omniorb/files/long_double.patch
new file mode 100644
index 0000000000..a34ff9807e
--- /dev/null
+++ b/packages/omniorb/files/long_double.patch
@@ -0,0 +1,19 @@
+*** omniORB-4.0.7.old/include/omniORB4/CORBA_sysdep_auto.h	2004-10-17 16:14:28.000000000 -0400
+--- omniORB-4.0.7/include/omniORB4/CORBA_sysdep_auto.h	2006-08-29 11:29:08.000000000 -0400
+***************
+*** 85,91 ****
+  #endif
+  
+  
+! #if defined(SIZEOF_LONG_DOUBLE) && (SIZEOF_LONG_DOUBLE == 16)
+  #  define HAS_LongDouble
+  #  define _CORBA_LONGDOUBLE_DECL long double
+  #endif
+--- 85,91 ----
+  #endif
+  
+  
+! #if defined(SIZEOF_LONG_DOUBLE)
+  #  define HAS_LongDouble
+  #  define _CORBA_LONGDOUBLE_DECL long double
+  #endif
diff --git a/packages/omniorb/omniorb-native_4.0.7.bb b/packages/omniorb/omniorb-native_4.0.7.bb
new file mode 100644
index 0000000000..f9addd997d
--- /dev/null
+++ b/packages/omniorb/omniorb-native_4.0.7.bb
@@ -0,0 +1,21 @@
+PR = "r0"
+SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz"
+SECTION = "devel"
+S = "${WORKDIR}/omniORB-${PV}"
+
+DEPENDS += python-native
+
+inherit native autotools
+
+do_compile () {
+	oe_runmake
+}
+
+
+#do_stage() {
+#	install -m 0755 src/bison ${STAGING_BINDIR}/
+#	ln -sf ./bison ${STAGING_BINDIR}/yacc
+#	install -d ${STAGING_BINDIR}/../share/bison/m4sugar
+#	install -m 0755 data/c.m4 data/glr.c data/lalr1.cc data/yacc.c ${STAGING_BINDIR}/../share/bison/
+#	install -m 0755 data/m4sugar/m4sugar.m4 ${STAGING_BINDIR}/../share/bison/m4sugar/
+#}
diff --git a/packages/omniorb/omniorb_4.0.7.bb b/packages/omniorb/omniorb_4.0.7.bb
new file mode 100644
index 0000000000..0ef6bdac03
--- /dev/null
+++ b/packages/omniorb/omniorb_4.0.7.bb
@@ -0,0 +1,37 @@
+PR = "r0"
+DESCRIPTION = "OmniORB High Performance ORB"
+SECTION = "devel"
+PRIORITY = "optional"
+MAINTAINER = "Philip Balister <philip@balister.org>"
+LICENSE = "LGPL"
+
+DEPENDS = omniorb-native
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz \
+file://omniORB-cross.patch;patch=1 \
+file://omniORB_embedded_appl.patch;patch=1" \
+file://long_double.patch;patch=1"
+
+S = "${WORKDIR}/omniORB-${PV}"
+
+inherit autotools pkgconfig
+
+#do_configure () {
+#	oe_runconf
+#}
+
+do_compile () {
+	export EmbeddedSystem=1
+	export TOOLBINDIR=${STAGING_BINDIR}
+	oe_runmake
+}
+
+do_stage () {
+	export EmbeddedSystem=1
+	make DESTDIR=${STAGING_DIR}/${TARGET_SYS} install
+}
+
+do_install () {
+	export EmbeddedSystem=1
+	make DESTDIR=${D} install
+}