diff options
| author | Phil Blundell <philb@gnu.org> | 2004-11-24 16:15:00 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-11-24 16:15:00 +0000 |
| commit | 86c84ef7f4fc3d1042978db9b81fa9975ff4d9f0 (patch) | |
| tree | e4c23fd1e41c45f4d391492fe9f764cfb4d7ff52 /glibc | |
| parent | 9de39c7652d27a04c2ec86dbf9ff8e6dd08c4d6d (diff) | |
correct dependencies on some glibc subpackages
BKrev: 41a4b384nr2MMdDT6d4nqMTBe3LVdA
Diffstat (limited to 'glibc')
| -rw-r--r-- | glibc/glibc-package.oeclass | 6 | ||||
| -rw-r--r-- | glibc/glibc_2.3.2+cvs20040726.oe | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/glibc/glibc-package.oeclass b/glibc/glibc-package.oeclass index adfe05c87e..6787be74b6 100644 --- a/glibc/glibc-package.oeclass +++ b/glibc/glibc-package.oeclass @@ -63,9 +63,9 @@ python package_do_split_gconvs () { charmap_dir = os.path.join(datadir, "i18n", "charmaps") locales_dir = os.path.join(datadir, "i18n", "locales") - do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s') + do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s', extra_depends='glibc-gconv') - do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='glibc-charmap-%s', description='character map for %s encoding') + do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='glibc-charmap-%s', description='character map for %s encoding', extra_depends='') def calc_locale_deps(fn, pkg, file_regex, output_pattern, group): deps = [] @@ -82,7 +82,7 @@ python package_do_split_gconvs () { if deps != []: 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) + do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') 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 6f8579e998..4fe381305e 100644 --- a/glibc/glibc_2.3.2+cvs20040726.oe +++ b/glibc/glibc_2.3.2+cvs20040726.oe @@ -6,7 +6,7 @@ PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r11" +PR = "r12" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" |