summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-04-21 14:37:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-29 14:45:09 +0100
commit3040cfc8cc2cd622556db0dcaae6c357d6d5c899 (patch)
tree2e74bf0a48e1d98561149b6521696c7ae66c3ca4 /meta/recipes-core
parentf1771b5bfa57db22d1d576b0cba137192a0b5d80 (diff)
downloadpoky-3040cfc8cc2cd622556db0dcaae6c357d6d5c899.tar.gz
glib-2.0: Update to 2.36
Remove automake patch that is now correctly supported upstream Codegen files have moved to glib-2.0, so correct packaging and removal. (From OE-Core rev: 0d13d9947262b09cd69bc526ea2738e50c658744) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch13
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb)12
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
3 files changed, 7 insertions, 20 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch b/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch
deleted file mode 100644
index 2fc4e75e78..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691011]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd glib-2.34.3/configure.ac glib-2.34.3/configure.ac
5--- glib-2.34.3/configure.ac 2012-11-26 19:10:04.000000000 +0200
6+++ glib-2.34.3/configure.ac 2013-01-02 15:49:27.832183712 +0200
7@@ -291,7 +291,6 @@
8 AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
9 AC_LANG_RESTORE
10
11-AM_PROG_CC_STDC
12 AM_PROG_CC_C_O
13 AC_PROG_INSTALL
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb
index 779552470c..a042972bd5 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb
@@ -1,6 +1,5 @@
1require glib.inc 1require glib.inc
2 2
3PR = "r2"
4PE = "1" 3PE = "1"
5 4
6DEPENDS += "libffi python-argparse-native zlib" 5DEPENDS += "libffi python-argparse-native zlib"
@@ -12,15 +11,16 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
12SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ 11SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
13 file://configure-libtool.patch \ 12 file://configure-libtool.patch \
14 file://glib-2.0_fix_for_x32.patch \ 13 file://glib-2.0_fix_for_x32.patch \
15 file://obsolete_automake_macros.patch \
16 file://fix-conflicting-rand.patch \ 14 file://fix-conflicting-rand.patch \
17 file://Makefile-ptest.patch \ 15 file://Makefile-ptest.patch \
18 file://run-ptest \ 16 file://run-ptest \
19 " 17 "
20SRC_URI[md5sum] = "a4ca31e258273c3761e3de2edd607661"
21SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7"
22 18
23SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" 19SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
20
21SRC_URI[md5sum] = "2047dff287473450593edecb18f79c17"
22SRC_URI[sha256sum] = "455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227"
23
24BBCLASSEXTEND = "native nativesdk" 24BBCLASSEXTEND = "native nativesdk"
25 25
26RDEPENDS_${PN}-ptest += "\ 26RDEPENDS_${PN}-ptest += "\
@@ -50,8 +50,8 @@ do_configure_prepend() {
50 50
51do_install_append() { 51do_install_append() {
52 # remove some unpackaged files 52 # remove some unpackaged files
53 rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyc 53 rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc
54 rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyo 54 rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo
55 # and empty dirs 55 # and empty dirs
56 rm -rf ${D}${libdir}/gio 56 rm -rf ${D}${libdir}/gio
57 57
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index d5fa0a30d5..aa1d4007bd 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -38,7 +38,7 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \
38 ${libdir}/gio/modules/*.la" 38 ${libdir}/gio/modules/*.la"
39FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \ 39FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \
40 ${libdir}/gio/modules/.debug" 40 ${libdir}/gio/modules/.debug"
41FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py" 41FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py"
42FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ 42FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \
43 ${datadir}/bash-completion" 43 ${datadir}/bash-completion"
44 44