From 9ca65a4ba59d37f08587c2b149c693500835eb2c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 3 Feb 2009 19:18:46 -0500 Subject: eglibc: Add DEPENDS += gperf-native to both 2.9 and svn Without this, install fails if you don't already have gperf installed on the host --- packages/eglibc/eglibc_2.9.bb | 3 ++- packages/eglibc/eglibc_svn.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'packages/eglibc') diff --git a/packages/eglibc/eglibc_2.9.bb b/packages/eglibc/eglibc_2.9.bb index 207c73a9aa..e2cac82280 100644 --- a/packages/eglibc/eglibc_2.9.bb +++ b/packages/eglibc/eglibc_2.9.bb @@ -1,9 +1,10 @@ require eglibc.inc +DEPENDS += "gperf-native" DEFAULT_PREFERENCE = "1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.9" -PR = "r0" +PR = "r1" SVN_REV="7430" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb index a0d322a954..fc3ed590e7 100644 --- a/packages/eglibc/eglibc_svn.bb +++ b/packages/eglibc/eglibc_svn.bb @@ -1,10 +1,11 @@ require eglibc.inc +DEPENDS += "gperf-native" SRCREV = "7542" # DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.9+svnr${SRCREV}" -PR = "r0" +PR = "r1" EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ -- cgit v1.2.3 From 57ac9ea14439d273363b6f28a7409d7a136fe1b8 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 6 Feb 2009 00:52:27 -0500 Subject: eglibc: Fix RPROVIDES of glibc-localedata-%s, add charmap gconv packages. The localedata function for doing the add needed to use group.lower() in the print adding to RPROVIDES (ipk at least is case-sensitive). Add similar functions for charmap and gconv. Bump PR. --- packages/eglibc/eglibc-package.bbclass | 38 +++++++++++++++++++++++++++++++--- packages/eglibc/eglibc_2.9.bb | 2 +- packages/eglibc/eglibc_svn.bb | 2 +- 3 files changed, 37 insertions(+), 5 deletions(-) (limited to 'packages/eglibc') diff --git a/packages/eglibc/eglibc-package.bbclass b/packages/eglibc/eglibc-package.bbclass index 2de24db859..74c9b739fb 100644 --- a/packages/eglibc/eglibc-package.bbclass +++ b/packages/eglibc/eglibc-package.bbclass @@ -193,9 +193,41 @@ python package_do_split_gconvs () { locales_dir = base_path_join(datadir, "i18n", "locales") binary_locales_dir = base_path_join(libdir, "locale") - do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='eglibc-gconv-%s', description='gconv module for character set %s', extra_depends='eglibc-gconv') + def calc_gconv_deps(fn, pkg, file_regex, output_pattern, group): + 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) or i_re.match(l) + if m: + dp = legitimize_package_name('eglibc-gconv-%s' % m.group(1)) + if not dp in deps: + deps.append(dp) + f.close() + if deps != []: + bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-gconv-%s' % group.lower(), d) + + do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='eglibc-gconv-%s', description='gconv module for character set %s', hook=calc_gconv_deps, extra_depends='eglibc-gconv') + + def calc_charmap_deps(fn, pkg, file_regex, output_pattern, group): + 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) or i_re.match(l) + if m: + dp = legitimize_package_name('eglibc-charmap-%s' % m.group(1)) + if not dp in deps: + deps.append(dp) + f.close() + if deps != []: + bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-charmap-%s' % group.lower(), d) - do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='eglibc-charmap-%s', description='character map for %s encoding', extra_depends='') + do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='eglibc-charmap-%s', description='character map for %s encoding', hook=calc_charmap_deps, extra_depends='') def calc_locale_deps(fn, pkg, file_regex, output_pattern, group): deps = [] @@ -211,7 +243,7 @@ python package_do_split_gconvs () { f.close() if deps != []: bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) - bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group, d) + bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group.lower(), d) do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d) diff --git a/packages/eglibc/eglibc_2.9.bb b/packages/eglibc/eglibc_2.9.bb index e2cac82280..7643bb3f6b 100644 --- a/packages/eglibc/eglibc_2.9.bb +++ b/packages/eglibc/eglibc_2.9.bb @@ -4,7 +4,7 @@ DEPENDS += "gperf-native" DEFAULT_PREFERENCE = "1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.9" -PR = "r1" +PR = "r2" SVN_REV="7430" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb index fc3ed590e7..9cf0393f79 100644 --- a/packages/eglibc/eglibc_svn.bb +++ b/packages/eglibc/eglibc_svn.bb @@ -5,7 +5,7 @@ SRCREV = "7542" # DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.9+svnr${SRCREV}" -PR = "r1" +PR = "r2" EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ -- cgit v1.2.3 From 89331f44f92a9fea40cd3027b8a022aba17d4c4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 8 Feb 2009 11:12:10 -0800 Subject: eglibc: Always use ARM instruction set for compilation. --- packages/eglibc/eglibc.inc | 2 ++ packages/eglibc/eglibc_2.9.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/eglibc') diff --git a/packages/eglibc/eglibc.inc b/packages/eglibc/eglibc.inc index e91ddaa40e..97a45ac8dc 100644 --- a/packages/eglibc/eglibc.inc +++ b/packages/eglibc/eglibc.inc @@ -18,4 +18,6 @@ LEAD_SONAME = "libc.so" GLIBC_EXTRA_OECONF ?= "" INHIBIT_DEFAULT_DEPS = "1" +ARM_INSTRUCTION_SET = "arm" + PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" diff --git a/packages/eglibc/eglibc_2.9.bb b/packages/eglibc/eglibc_2.9.bb index 7643bb3f6b..7a71fcd646 100644 --- a/packages/eglibc/eglibc_2.9.bb +++ b/packages/eglibc/eglibc_2.9.bb @@ -4,7 +4,7 @@ DEPENDS += "gperf-native" DEFAULT_PREFERENCE = "1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.9" -PR = "r2" +PR = "r3" SVN_REV="7430" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ -- cgit v1.2.3