4 files changed, 103 insertions, 0 deletions

diff --git a/meta/packages/glib-2.0/glib-2.0-2.18.1/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.18.1/configure-libtool.patch
new file mode 100644
index 0000000000..3ba79b8986
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-2.18.1/configure-libtool.patch
@@ -0,0 +1,34 @@
+# Poky renames libtool to $host_alias-libtool.
+# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2
+# so we can't call # it at this point. We can safely assume a version is available 
+# from PATH though
+
+--- glib-2.12.10/configure.in.orig      2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in   2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+   G_MODULE_LDFLAGS=
+ else
+   export SED
+-  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1265,7 +1265,7 @@
+        LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+        echo "void glib_plugin_test(void) { }" > plugin.c
+-       ${SHELL} ./libtool --mode=compile ${CC} -shared \
++       ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \
+                -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+        AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+                glib_cv_rtldglobal_broken,[
+@@ -1339,7 +1339,7 @@
+ 
+ AC_MSG_CHECKING(for the suffix of shared libraries)
+ export SED
+-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
++shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='`
+ eval $shrext_cmds
+ module=yes eval std_shrext=$shrext_cmds
+ # chop the initial dot
diff --git a/meta/packages/glib-2.0/glib-2.0-2.18.1/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.18.1/glib-gettextize-dir.patch
new file mode 100644
index 0000000000..efe3325578
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-2.18.1/glib-gettextize-dir.patch
@@ -0,0 +1,11 @@
+--- glib-2.10.3/glib-gettextize.in.old  2006-06-21 12:46:45.000000000 +0100
++++ glib-2.10.3/glib-gettextize.in      2006-06-21 12:48:14.000000000 +0100
+@@ -49,7 +49,7 @@
+     ;;
+ esac
+ 
+-gettext_dir=$prefix/share/glib-2.0/gettext
++gettext_dir=@datadir@/glib-2.0/gettext
+ 
+ while test $# -gt 0; do
+   case "$1" in
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.18.1.bb b/meta/packages/glib-2.0/glib-2.0-native_2.18.1.bb
new file mode 100644
index 0000000000..ff593ccffa
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-native_2.18.1.bb
@@ -0,0 +1,51 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS += "gtk-doc-native"
+PR = "r1"
+
+SRC_URI = "http://download.gnome.org/sources/glib/2.18/glib-${PV}.tar.bz2 \
+           file://glib-gettextize-dir.patch;patch=1 \
+           file://configure-libtool.patch;patch=1 \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig native gettext
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glib-2.0-${PV}"
+
+acpaths = ""
+do_configure_prepend () {
+        install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+        install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
+        install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
+        install -m 0755 glib-gettextize ${STAGING_BINDIR}/
+        oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+        oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+        oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+        oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+        oe_libinstall -so -C gio libgio-2.0 ${STAGING_LIBDIR}
+        autotools_stage_includes
+        install -d ${STAGING_INCDIR}/glib-2.0/glib
+        install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+        install -d ${STAGING_DATADIR}/aclocal
+        install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+        install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+        install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
+        install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
+        install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
+}
+
+do_install () {
+        :
+}
+
diff --git a/meta/packages/glib-2.0/glib-2.0_2.18.1.bb b/meta/packages/glib-2.0/glib-2.0_2.18.1.bb
new file mode 100644
index 0000000000..93326d8ae7
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0_2.18.1.bb
@@ -0,0 +1,7 @@
+require glib.inc
+
+PR = "r0"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
+           file://glibconfig-sysdefs.h \
+           file://configure-libtool.patch;patch=1"