From a6314a0f40010a1e6c0216083c93a28028c955df Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 29 Oct 2007 21:28:10 +0000 Subject: glibc: Sync glibc.inc cleanup from OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3029 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/glibc/glibc-initial_2.4.bb | 1 - meta/packages/glibc/glibc.inc | 17 +++++++++++++++++ meta/packages/glibc/glibc_2.3.5+cvs20050627.bb | 17 +---------------- meta/packages/glibc/glibc_2.4.bb | 19 ++----------------- meta/packages/glibc/glibc_2.5.bb | 11 ----------- meta/packages/glibc/glibc_csl-2005q3-2.bb | 17 ++--------------- 6 files changed, 22 insertions(+), 60 deletions(-) (limited to 'meta/packages') diff --git a/meta/packages/glibc/glibc-initial_2.4.bb b/meta/packages/glibc/glibc-initial_2.4.bb index d3dc4b587a..fa7836ad88 100644 --- a/meta/packages/glibc/glibc-initial_2.4.bb +++ b/meta/packages/glibc/glibc-initial_2.4.bb @@ -1,3 +1,2 @@ require glibc_${PV}.bb require glibc-initial.inc - diff --git a/meta/packages/glibc/glibc.inc b/meta/packages/glibc/glibc.inc index 4d70e77850..9145a2d4d7 100644 --- a/meta/packages/glibc/glibc.inc +++ b/meta/packages/glibc/glibc.inc @@ -1,3 +1,20 @@ +DESCRIPTION = "GNU C Library" +HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" +SECTION = "libs" +PRIORITY = "required" +LICENSE = "LGPL" +# nptl needs unwind support in gcc, which can't be built without glibc. +DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +#this leads to circular deps, so lets not add it yet +#RDEPENDS_ldd += " bash" +PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" +PROVIDES += "virtual/libintl virtual/libiconv" + +inherit autotools + +GLIBC_EXTRA_OECONF ?= "" +INHIBIT_DEFAULT_DEPS = "1" do_rig_locales() { # If indicated, only build a limited selection of locales diff --git a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb index 242274b609..11a28cba6c 100644 --- a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -1,15 +1,10 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" +require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" PR = "r4" GLIBC_ADDONS ?= "ports,linuxthreads" -GLIBC_EXTRA_OECONF ?= "" GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN" @@ -29,13 +24,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 # file://arm-machine-gmon.patch;patch=1;pnum=0 \ @@ -62,8 +50,6 @@ SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ @@ -122,4 +108,3 @@ do_compile () { require glibc-stage.inc require glibc-package.bbclass -include glibc.inc diff --git a/meta/packages/glibc/glibc_2.4.bb b/meta/packages/glibc/glibc_2.4.bb index a8e6f740ad..95b2b99853 100644 --- a/meta/packages/glibc/glibc_2.4.bb +++ b/meta/packages/glibc/glibc_2.4.bb @@ -1,20 +1,14 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" -# DEFAULT_PREFERENCE = "-1" +require glibc.inc + PR = "r11" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" - FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" GLIBC_ADDONS ?= "ports,nptl,libidn" -GLIBC_EXTRA_OECONF ?= "" GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET bn_BD gez_ER te_IN" @@ -34,13 +28,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 # file://arm-machine-gmon.patch;patch=1;pnum=0 \ @@ -73,8 +60,6 @@ SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" S = "${WORKDIR}/glibc-2.4" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/meta/packages/glibc/glibc_2.5.bb b/meta/packages/glibc/glibc_2.5.bb index ccac98fcae..e40993909d 100644 --- a/meta/packages/glibc/glibc_2.5.bb +++ b/meta/packages/glibc/glibc_2.5.bb @@ -6,11 +6,9 @@ PR = "r5" BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" - FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" GLIBC_ADDONS ?= "ports,nptl,libidn" -GLIBC_EXTRA_OECONF ?= "" GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" @@ -30,13 +28,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 # file://arm-machine-gmon.patch;patch=1;pnum=0 \ @@ -74,8 +65,6 @@ SRC_URI_append_powerpc = " file://powerpc-sqrt-hack.diff;patch=1" S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/meta/packages/glibc/glibc_csl-2005q3-2.bb b/meta/packages/glibc/glibc_csl-2005q3-2.bb index a28c0b2361..1fff0e1967 100644 --- a/meta/packages/glibc/glibc_csl-2005q3-2.bb +++ b/meta/packages/glibc/glibc_csl-2005q3-2.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" +require glibc.inc + # DEFAULT_PREFERENCE = "-1" PV = "2.3.6+csl-arm-2005q3-2" PR = "r11" @@ -14,7 +11,6 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" FILESDIR = "${FILE_DIRNAME}/files" GLIBC_ADDONS ?= "nptl,libidn" -GLIBC_EXTRA_OECONF ?= "" GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET bn_BD gez_ER te_IN" @@ -34,13 +30,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -# nptl needs unwind support in gcc, which can't be built without glibc. -PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -RDEPENDS_${PN}-dev = "" -INHIBIT_DEFAULT_DEPS = "1" - SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \ file://nptl-crosscompile-2.3.6.patch;patch=1 \ file://etc/ld.so.conf \ @@ -58,8 +47,6 @@ addtask unpack2 after do_unpack before do_patch S = "${WORKDIR}/glibc-2.3.5pre" B = "${WORKDIR}/build-${TARGET_SYS}" -inherit autotools - EXTRA_OECONF = "--without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ --enable-add-ons \ -- cgit v1.2.3