diff options
| author | Phil Blundell <philb@gnu.org> | 2004-08-17 20:43:20 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-08-17 20:43:20 +0000 |
| commit | f172dae4b909b93a9a2c16f9ae89c661c0720830 (patch) | |
| tree | a27a4122b7af1bce7c222af517a5a066b76f3c47 | |
| parent | 2808f98ec2d895daa29baac39b4a579a52817855 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into stealth.(none):/home/pb/oe/oe-packages
2004/08/17 21:43:01+01:00 (none)!pb
also handle 'include' lines in locale defs
BKrev: 41226de8W0uNfLN9PIIZm1VvYfJ4CA
| -rw-r--r-- | glibc/glibc-package.oeclass | 6 | ||||
| -rw-r--r-- | glibc/glibc_2.3.2+cvs20040726.oe | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/glibc/glibc-package.oeclass b/glibc/glibc-package.oeclass index ff484f9189..adfe05c87e 100644 --- a/glibc/glibc-package.oeclass +++ b/glibc/glibc-package.oeclass @@ -71,8 +71,9 @@ python package_do_split_gconvs () { deps = [] f = open(fn, "r") c_re = re.compile('^copy "(.*)"') + i_re = re.compile('^include "(\w+)".*') for l in f.readlines(): - m = c_re.match(l) + m = c_re.match(l) or i_re.match(l) if m: dp = legitimize_package_name('glibc-localedata-%s' % m.group(1)) if not dp in deps: @@ -82,9 +83,6 @@ python package_do_split_gconvs () { oe.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps) - # clobber unwanted self-dependency - oe.data.setVar('RDEPENDS_glibc-localedata-i18n', '', d) - oe.data.setVar('PACKAGES', oe.data.getVar('PACKAGES', d) + ' glibc-gconv', d) f = open(os.path.join(oe.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") diff --git a/glibc/glibc_2.3.2+cvs20040726.oe b/glibc/glibc_2.3.2+cvs20040726.oe index a04e20ee63..b1f446d0ce 100644 --- a/glibc/glibc_2.3.2+cvs20040726.oe +++ b/glibc/glibc_2.3.2+cvs20040726.oe @@ -1,5 +1,5 @@ FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r6" +PR = "r8" DESCRIPTION = "GNU C Library" LICENSE = "LGPL" SECTION = "libs" |