diff options
| -rw-r--r-- | packages/glib-2.0/glib-2.0-2.18.0/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/glib-2.0/glib-2.0-2.18.0/configure-libtool.patch | 34 | ||||
| -rw-r--r-- | packages/glib-2.0/glib-2.0_2.18.0.bb | 11 | ||||
| -rw-r--r-- | packages/glib-2.0/glib.inc | 6 |
4 files changed, 49 insertions, 2 deletions
diff --git a/packages/glib-2.0/glib-2.0-2.18.0/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.18.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.18.0/.mtn2git_empty diff --git a/packages/glib-2.0/glib-2.0-2.18.0/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.18.0/configure-libtool.patch new file mode 100644 index 0000000000..3ba79b8986 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.18.0/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/packages/glib-2.0/glib-2.0_2.18.0.bb b/packages/glib-2.0/glib-2.0_2.18.0.bb new file mode 100644 index 0000000000..3ac0487018 --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.18.0.bb @@ -0,0 +1,11 @@ +require glib.inc + +# This version requires a newer libtool that isn't default yet +DEFAULT_PREFERENCE = "-1" + +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 \ + " diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc index 596b3bb90b..2120e38c22 100644 --- a/packages/glib-2.0/glib.inc +++ b/packages/glib-2.0/glib.inc @@ -14,8 +14,10 @@ PR = "r2" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" -FILES_${PN} = "${libdir}/lib*so.*" -FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0" +FILES_${PN} = "${libdir}/lib*so.* ${libdir}/gio/modules/*.so" +FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0 ${libdir}/gio/modules/*.la" +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug" + EXTRA_OECONF = "--disable-debug " |