summaryrefslogtreecommitdiffstats
path: root/meta/packages/glib-2.0/glib.inc
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-06-25 15:07:01 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-07-02 15:32:28 -0700
commit31180a56d1b6981fa9d5588ad3538f34e339e0fe (patch)
tree2e4bb97f22d2d02357f316c8a628dea6af1059ff /meta/packages/glib-2.0/glib.inc
parent6b81c6dbb55d57a0f8d96ee5e3f5d1e6148850b1 (diff)
downloadpoky-31180a56d1b6981fa9d5588ad3538f34e339e0fe.tar.gz
glib-2.0: upgrade to 2.24.1
(borrow from OE 2.24.0, with study about reason for detail changes) [Patches-Poky] KEEP _configure-libtool.patch_: fix cross-build env REMOVE _glibconfig-sysdefs.h_: introduced in glib-1.2.10, which is actually not valid today KEEP _glib-gettexize-dir.patch_: another quite old patch added before 2.10.3 add history info, and mark for upstream [Patches-OE] NOTAKE _gio.patch_: a private extension for a window matching library (wncksync) NOTAKE _gvavriant.patch_: in 2.24.1 now NOTAKE _gasync.patch_: in 2.24.1 now TAKE _60_wait-longer-for-threads-to-die.patch: said to fix anonying warning TAKE _gatomic-proper-get-cast.patch_: fix error about type casting. Instead of using OE's patch, I found a better one from latest repo NOTAKE _g_once_init_enter.patch_: in OE since 2.22.1, not quite sure of its purpose, also it's not in upstream yet [Recipe] - fix metadata - keep glib-2.inc which is for python optimization - remove PRIORITY since 'optional' is the default - no need to specially install glibconfig.h in ad hoc path, which is only relied by 'obexpush' which poky doesn't have and can be fixed in 'obexpush' itself as what OE does - no need to manually create glib2.0/glib, which is handled by current code - remove 'acpaths' which only applies to versions before 2.12.4 - below lines are not taken from OE * glib-mkenums tweaks, which exists in OE for a long time but never in poky. since there's no way to find out original commit, keep poky's style instead. * host libtool check. not sure about its purpose, and it's also in OE for quite long time Signed-off-by Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/glib-2.0/glib.inc')
-rw-r--r--meta/packages/glib-2.0/glib.inc41
1 files changed, 19 insertions, 22 deletions
diff --git a/meta/packages/glib-2.0/glib.inc b/meta/packages/glib-2.0/glib.inc
index f4167e8bf8..6e7f6a3347 100644
--- a/meta/packages/glib-2.0/glib.inc
+++ b/meta/packages/glib-2.0/glib.inc
@@ -1,35 +1,32 @@
1DESCRIPTION = "GLib is a general-purpose utility library, \ 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"
2which provides many useful data types, macros, \ 2# pcre is under BSD;
3type conversions, string utilities, file utilities, a main \ 3# docs/reference/COPYING is with a 'public domai'-like license!
4loop abstraction, and so on. It works on many \ 4LICENSE = "LGPLv2+ & BSD & public domain"
5UNIX-like platforms, Windows, OS/2 and BeOS." 5LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
6LICENSE = "LGPL" 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"
7SECTION = "libs" 13SECTION = "libs"
8PRIORITY = "optional" 14
9DEPENDS = "glib-2.0-native gtk-doc-native virtual/libiconv virtual/libintl" 15require glib-2.0.inc
16
17DEPENDS = "glib-2.0-native gtk-doc-native virtual/libiconv virtual/libintl zip"
10DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native" 18DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native"
11PACKAGES =+ "glib-2.0-utils " 19PACKAGES =+ "glib-2.0-utils "
12 20
13LEAD_SONAME = "libglib-2.0.*" 21LEAD_SONAME = "libglib-2.0.*"
14FILES_glib-2.0-utils = "${bindir}/*" 22FILES_glib-2.0-utils = "${bindir}/*"
15 23
16EXTRA_OECONF = "--enable-included-printf=no"
17
18S = "${WORKDIR}/glib-${PV}"
19
20inherit autotools pkgconfig gettext 24inherit autotools pkgconfig gettext
21 25
22require glib-2.0.inc 26S = "${WORKDIR}/glib-${PV}"
23
24acpaths = ""
25do_configure_prepend () {
26 install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
27}
28 27
29do_install_append () { 28EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
30 install -d ${D}${includedir}/glib-2.0/glib 29EXTRA_OECONF_virtclass-native = ""
31 install -m 0755 ${S}/glibconfig.h ${D}${includedir}/glib-2.0/glibconfig.h
32}
33 30
34FILES_${PN} = "${libdir}/lib*${SOLIBS}" 31FILES_${PN} = "${libdir}/lib*${SOLIBS}"
35FILES_${PN}-dev += "${libdir}/glib-2.0/include" 32FILES_${PN}-dev += "${libdir}/glib-2.0/include"