glib-2.0: Set FILESDIR and merge patches directories

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3731 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/glib-2.0/glib-2.0-native-2.14.6/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch
similarity index 100%
rename from meta/packages/glib-2.0/glib-2.0-native-2.14.6/glib-gettextize-dir.patch
rename to meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch

diff --git a/meta/packages/glib-2.0/glib-2.0-native-2.14.6/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-native-2.14.6/configure-libtool.patch
deleted file mode 100644 (file)
index a52327c..0000000
--- a/meta/packages/glib-2.0/glib-2.0-native-2.14.6/configure-libtool.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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-native_2.14.6.bb b/meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb
index 194c744bc2b1994e38c0dc5847f2248a6afcdd52..0921cb847333134ac6115cbf0d31ce64c2664dfb 100644 (file)
--- a/meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb
+++ b/meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb
@@ -18,6 +18,8 @@ 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 .