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-29 23:41:37 +0000 |
commit | eef7883587acc933d6f34b559ec03ff84d18573b (patch) | |
tree | 970e079f5e04e737ff0271fe3272e0bc18e159f3 /meta/recipes-core/glib-2.0/glib.inc | |
parent | 6e23418c69fade223c4a83425865714e901e6da4 (diff) | |
download | openembedded-core-contrib-eef7883587acc933d6f34b559ec03ff84d18573b.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.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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/" # pcre is under BSD; # docs/reference/COPYING is with a 'public domai'-like license! -LICENSE = "LGPLv2+ & BSD & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://glib/glib.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ - file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://gmodule/gmodule.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ +LICENSE = "LGPLv2.1+ & BSD & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ + file://gmodule/COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://gmodule/gmodule.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \ file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" @@ -95,12 +95,6 @@ do_install_append () { rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo - # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location - # for target as /usr/bin/perl, so fix it to /usr/bin/perl. - if [ -f ${D}${bindir}/glib-mkenums ]; then - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums - fi - if [ -e ${D}${libdir}/charset.alias ]; then rm -f ${D}${libdir}/charset.alias fi |