diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 19:21:24 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:21:24 +0000 |
commit | 86d1d8cd13335c4dca722ac398c69a105fc9ac8f (patch) | |
tree | bf7433f99e0fc0ffbdbddd24c2201d21a9dd60e8 /packages/glibc | |
parent | 249a5476b2d2ec15e71b126bb02bc885b29604ee (diff) | |
parent | 45e1048fb2a2fc047c8a903966ca5cc9d1e03112 (diff) |
explicit_merge of '93b8d4a095a60dfe2b4b6e82f4ce68721a1d4f11'
and 'd5130c6d17c31fa91dee51b0074c7e5e8c87717c'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'packages/glibc')
-rw-r--r-- | packages/glibc/glibc-package.bbclass | 2 | ||||
-rw-r--r-- | packages/glibc/glibc_2.3.5+cvs20050627.bb | 2 | ||||
-rw-r--r-- | packages/glibc/glibc_cvs.bb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 053794ed7f..9a91e3ab24 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -95,6 +95,8 @@ mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ rm -rf ${TMP_LOCALE} } +PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-*" + python package_do_split_gconvs () { import os, re if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'): diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 5ee5583fc8..e7adcd0a39 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -6,7 +6,7 @@ PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -CVSDATE = "20050627" +SRCDATE = "20050627" PR = "r1" GLIBC_ADDONS ?= "ports,linuxthreads" diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index 99dd80b7ef..0390b87535 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" PR = "r0" -PV = "2.3.5+cvs${CVSDATE}" +PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" |