summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-02-11 09:51:13 +0000
committerRichard Purdie <richard@openedhand.com>2008-02-11 09:51:13 +0000
commit033c32be3926e7d636865dfd89a341e11719cc30 (patch)
tree76f9cc1c45c2678107bba6c57af90cff42e60eda /meta/packages
parent6c117e9a2df2e897bb4219601fa0df4769261e90 (diff)
downloadpoky-033c32be3926e7d636865dfd89a341e11719cc30.tar.gz
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
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch (renamed from meta/packages/glib-2.0/glib-2.0-native-2.14.6/glib-gettextize-dir.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native-2.14.6/configure-libtool.patch29
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb2
3 files changed, 2 insertions, 29 deletions
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
index efe3325578..efe3325578 100644
--- 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
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
index a52327c8c9..0000000000
--- a/meta/packages/glib-2.0/glib-2.0-native-2.14.6/configure-libtool.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
2+++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100
3@@ -1174,7 +1174,7 @@
4 G_MODULE_LDFLAGS=
5 else
6 export SED
7- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
8+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
9 fi
10 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
11 G_MODULE_NEED_USCORE=0
12@@ -1265,7 +1265,7 @@
13 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
14 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
15 echo "void glib_plugin_test(void) { }" > plugin.c
16- ${SHELL} ./libtool --mode=compile ${CC} -shared \
17+ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
18 -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
19 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
20 glib_cv_rtldglobal_broken,[
21@@ -1339,7 +1339,7 @@
22
23 AC_MSG_CHECKING(for the suffix of shared libraries)
24 export SED
25-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
26+shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
27 eval $shrext_cmds
28 module=yes eval std_shrext=$shrext_cmds
29 # 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 194c744bc2..0921cb8473 100644
--- 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}"
18 18
19inherit autotools pkgconfig native gettext 19inherit autotools pkgconfig native gettext
20 20
21FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glib-2.0-${PV}"
22
21acpaths = "" 23acpaths = ""
22do_configure_prepend () { 24do_configure_prepend () {
23 install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . 25 install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .