summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-core/glib-2.0
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch29
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch34
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch37
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-2.24.1/glib-gettextize-dir.patch19
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0.inc6
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb11
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc34
7 files changed, 170 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch
new file mode 100644
index 0000000000..1676b3e257
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch
@@ -0,0 +1,29 @@
1# copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for sanity.
2#
3# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
4--- glib/tests/threadpool-test.c.old 2008-02-12 06:11:21.000000000 +0100
5+++ glib/tests/threadpool-test.c 2008-02-12 06:11:52.000000000 +0100
6@@ -5,8 +5,8 @@
7
8 #include <glib.h>
9
10-#define DEBUG_MSG(x)
11-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */
12+/* #define DEBUG_MSG(x) */
13+#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
14
15 #define WAIT 5 /* seconds */
16 #define MAX_THREADS 10
17@@ -124,10 +124,10 @@
18 DEBUG_MSG (("[unused] stopping unused threads"));
19 g_thread_pool_stop_unused_threads ();
20
21- DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
22+ DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
23
24 /* Some time for threads to die. */
25- g_usleep (G_USEC_PER_SEC);
26+ g_usleep (5 * G_USEC_PER_SEC);
27
28 DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist",
29 g_thread_pool_get_num_unused_threads (),
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch
new file mode 100644
index 0000000000..3ba79b8986
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch
@@ -0,0 +1,34 @@
1# Poky renames libtool to $host_alias-libtool.
2# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2
3# so we can't call # it at this point. We can safely assume a version is available
4# from PATH though
5
6--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
7+++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100
8@@ -1174,7 +1174,7 @@
9 G_MODULE_LDFLAGS=
10 else
11 export SED
12- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
13+ G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
14 fi
15 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
16 G_MODULE_NEED_USCORE=0
17@@ -1265,7 +1265,7 @@
18 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
19 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
20 echo "void glib_plugin_test(void) { }" > plugin.c
21- ${SHELL} ./libtool --mode=compile ${CC} -shared \
22+ ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \
23 -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
24 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
25 glib_cv_rtldglobal_broken,[
26@@ -1339,7 +1339,7 @@
27
28 AC_MSG_CHECKING(for the suffix of shared libraries)
29 export SED
30-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
31+shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='`
32 eval $shrext_cmds
33 module=yes eval std_shrext=$shrext_cmds
34 # chop the initial dot
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch
new file mode 100644
index 0000000000..1f3920f03a
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch
@@ -0,0 +1,37 @@
1# handle cast warning. borrow from OE, but updated with a better fix from glib
2# developing tree.
3#
4# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
5commit bf2719c815d719d1899b4bdb1b81ff6798471094
6Author: Lars Ellenberg <lars.ellenberg@linbit.com>
7Date: Thu Apr 15 19:03:05 2010 +0200
8
9 Cast to volatile to avoid warnings from -Wcast-qual
10
11 https://bugzilla.gnome.org/show_bug.cgi?id=457641
12
13diff --git a/glib/gatomic.h b/glib/gatomic.h
14index 7d9c318..22b28d9 100644
15--- a/glib/gatomic.h
16+++ b/glib/gatomic.h
17@@ -64,16 +64,16 @@ void g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALI
18 #else
19 # define g_atomic_int_get(atomic) \
20 ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
21- (g_atomic_int_get) ((volatile gint G_GNUC_MAY_ALIAS *) (void *) (atomic)))
22+ (g_atomic_int_get) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
23 # define g_atomic_int_set(atomic, newval) \
24 ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
25- (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval)))
26+ (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
27 # define g_atomic_pointer_get(atomic) \
28 ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
29- (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic)))
30+ (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
31 # define g_atomic_pointer_set(atomic, newval) \
32 ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
33- (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval)))
34+ (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
35 #endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
36
37 #define g_atomic_int_inc(atomic) (g_atomic_int_add ((atomic), 1))
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/glib-gettextize-dir.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/glib-gettextize-dir.patch
new file mode 100644
index 0000000000..c44e491556
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/glib-gettextize-dir.patch
@@ -0,0 +1,19 @@
1# an very old patch cherry-picked in every glib-2.0 patch directory. The earliest container
2# for it is 2.6.5 in OE. The earliest commit for it is c8e5702127e507e82e6f68a4b8c546803accea9d
3# in OE side which ports from previous bitkeeper SCM. In OE side it's only used til 2.12.4.
4#
5# keep it since it's always cleaner to not hardcode destination path. Use @datadir@ is more
6# portable here. mark for upstream
7#
8# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
9--- glib-2.10.3/glib-gettextize.in.old 2006-06-21 12:46:45.000000000 +0100
10+++ glib-2.10.3/glib-gettextize.in 2006-06-21 12:48:14.000000000 +0100
11@@ -49,7 +49,7 @@
12 ;;
13 esac
14
15-gettext_dir=$prefix/share/glib-2.0/gettext
16+gettext_dir=@datadir@/glib-2.0/gettext
17
18 while test $# -gt 0; do
19 case "$1" in
diff --git a/meta/recipes-core/glib-2.0/glib-2.0.inc b/meta/recipes-core/glib-2.0/glib-2.0.inc
new file mode 100644
index 0000000000..ccbbd2b35a
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0.inc
@@ -0,0 +1,6 @@
1
2python () {
3 import bb
4 if bb.data.getVar("USE_NLS", d, 1) == "no":
5 raise bb.parse.SkipPackage("${PN} requires native language support.")
6}
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb
new file mode 100644
index 0000000000..d8d1cc52d2
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb
@@ -0,0 +1,11 @@
1require glib.inc
2
3PR = "r0"
4
5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${PV}.tar.bz2 \
6 file://configure-libtool.patch \
7 file://gatomic-proper-pointer-get-cast.patch \
8 file://60_wait-longer-for-threads-to-die.patch"
9
10SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
11BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
new file mode 100644
index 0000000000..6e7f6a3347
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -0,0 +1,34 @@
1DESCRIPTION = "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"
2# pcre is under BSD;
3# docs/reference/COPYING is with a 'public domai'-like license!
4LICENSE = "LGPLv2+ & BSD & public domain"
5LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
6 file://glib/glib.h;startline=4;endline=17;md5=a4332fe58b076f29d07c9c066d2967b6 \
7 file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
8 file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \
9 file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \
10 file://glib/pcre/pcre.h;startline=11;endline=35;md5=000109ccf7c4c470b74046e2cc59f7e3 \
11 file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
12BUGTRACKER = "http://bugzilla.gnome.org"
13SECTION = "libs"
14
15require glib-2.0.inc
16
17DEPENDS = "glib-2.0-native gtk-doc-native virtual/libiconv virtual/libintl zip"
18DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native"
19PACKAGES =+ "glib-2.0-utils "
20
21LEAD_SONAME = "libglib-2.0.*"
22FILES_glib-2.0-utils = "${bindir}/*"
23
24inherit autotools pkgconfig gettext
25
26S = "${WORKDIR}/glib-${PV}"
27
28EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
29EXTRA_OECONF_virtclass-native = ""
30
31FILES_${PN} = "${libdir}/lib*${SOLIBS}"
32FILES_${PN}-dev += "${libdir}/glib-2.0/include"
33
34ARM_INSTRUCTION_SET = "arm"