diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-11-14 16:57:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-30 10:49:22 +0000 |
commit | 709a730bf04e30ce2d1ba1bf48c2b5c8e6631f9f (patch) | |
tree | ee8a7e5480ca2d7247f31a7ea022f12e3d4076f5 /meta/recipes-core/glib-2.0/glib.inc | |
parent | a46657ceb1dfb86330a4778186f8e3d81e1ac233 (diff) | |
download | poky-709a730bf04e30ce2d1ba1bf48c2b5c8e6631f9f.tar.gz |
glib-2.0: update to 2.54.2
LGPL version has been updated from 2.0 to 2.1, adjust the checksums accordingly.
Rebase various patches.
A few tools have been rewritten from perl (or C) to python, so
add a patch that avoids hardcoding the python path in the shebang,
and remove previous patching with sed.
(From OE-Core rev: eef7883587acc933d6f34b559ec03ff84d18573b)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib.inc')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 8434b7dae3..42ab5f1562 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -4,11 +4,11 @@ HOMEPAGE = "https://developer.gnome.org/glib/" | |||
4 | 4 | ||
5 | # pcre is under BSD; | 5 | # pcre is under BSD; |
6 | # docs/reference/COPYING is with a 'public domai'-like license! | 6 | # docs/reference/COPYING is with a 'public domai'-like license! |
7 | LICENSE = "LGPLv2+ & BSD & PD" | 7 | LICENSE = "LGPLv2.1+ & BSD & PD" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ |
9 | file://glib/glib.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ | 9 | file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ |
10 | file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ | 10 | file://gmodule/COPYING;md5=4fbd65380cdd255951079008b364516c \ |
11 | file://gmodule/gmodule.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ | 11 | file://gmodule/gmodule.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ |
12 | file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ | 12 | file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ |
13 | file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \ | 13 | file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \ |
14 | file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" | 14 | file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" |
@@ -95,12 +95,6 @@ do_install_append () { | |||
95 | rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc | 95 | rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc |
96 | rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo | 96 | rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo |
97 | 97 | ||
98 | # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location | ||
99 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. | ||
100 | if [ -f ${D}${bindir}/glib-mkenums ]; then | ||
101 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums | ||
102 | fi | ||
103 | |||
104 | if [ -e ${D}${libdir}/charset.alias ]; then | 98 | if [ -e ${D}${libdir}/charset.alias ]; then |
105 | rm -f ${D}${libdir}/charset.alias | 99 | rm -f ${D}${libdir}/charset.alias |
106 | fi | 100 | fi |