diff options
-rw-r--r-- | packages/glibc/glibc.inc | 13 | ||||
-rw-r--r-- | packages/glibc/glibc_2.2.5.bb | 8 | ||||
-rw-r--r-- | packages/glibc/glibc_2.3.2+cvs20040726.bb | 9 | ||||
-rw-r--r-- | packages/glibc/glibc_2.3.2.bb | 10 | ||||
-rw-r--r-- | packages/glibc/glibc_2.3.3+cvs20041128.bb | 9 | ||||
-rw-r--r-- | packages/glibc/glibc_2.3.3+cvs20050221.bb | 9 | ||||
-rw-r--r-- | packages/glibc/glibc_2.3.3+cvs20050420.bb | 9 | ||||
-rw-r--r-- | packages/glibc/glibc_2.3.3.bb | 9 | ||||
-rw-r--r-- | packages/glibc/glibc_2.3.5+cvs20050627.bb | 8 | ||||
-rw-r--r-- | packages/glibc/glibc_2.4.bb | 8 | ||||
-rw-r--r-- | packages/glibc/glibc_2.5.bb | 8 | ||||
-rw-r--r-- | packages/glibc/glibc_cvs.bb | 8 |
12 files changed, 11 insertions, 97 deletions
diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc index 7078a1c09f..10c2796825 100644 --- a/packages/glibc/glibc.inc +++ b/packages/glibc/glibc.inc @@ -3,7 +3,16 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" SECTION = "libs" PRIORITY = "required" LICENSE = "LGPL" -PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" - +# 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" #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" + +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/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 75f08be942..adb8a45283 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -6,7 +6,6 @@ PR = "r10" DEFAULT_PREFERENCE_sh3 = "-99" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" # # For now, we will skip building of a gcc package if it is a uclibc one @@ -24,12 +23,7 @@ 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_unslung = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" -PROVIDES += "virtual/libintl virtual/libiconv" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" @@ -113,8 +107,6 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz \ 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/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index 40fef7bed4..85f64371a8 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -6,13 +6,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r22" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" - -# 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" -INHIBIT_DEFAULT_DEPS = "1" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 @@ -38,8 +31,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.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 \ diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 1dba326201..87a6906915 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -5,7 +5,6 @@ PR = "r11" DEFAULT_PREFERENCE_sh3 = "-99" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" # # For now, we will skip building of a gcc package if it is a uclibc one @@ -23,13 +22,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -PROVIDES += "virtual/libintl virtual/libiconv" - -# 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}']}" -DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" -INHIBIT_DEFAULT_DEPS = "1" - libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo" @@ -114,8 +106,6 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ 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/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index 9286fce398..6bbc8ec8af 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -6,7 +6,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r7" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_i686 = "0" @@ -29,12 +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" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \ @@ -57,8 +50,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.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 \ diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index 6382d12e57..576047ce1e 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -6,19 +6,12 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r7" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_i686 = "0" DEFAULT_PREFERENCE_sh3 = "0" DEFAULT_PREFERENCE_sh4 = "0" -# 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" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \ @@ -42,8 +35,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.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 \ diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index f955a6e0a0..4a548fa9bc 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -8,16 +8,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" PR = "r5" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-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" -INHIBIT_DEFAULT_DEPS = "1" - # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \ @@ -43,8 +36,6 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.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 \ diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 0db2616a75..3f3690a73c 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -8,7 +8,6 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_mipsel = "0" GLIBC_ADDONS ?= "linuxthreads" -GLIBC_EXTRA_OECONF ?= "" # # For now, we will skip building of a gcc package if it is a uclibc one @@ -26,12 +25,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" -INHIBIT_DEFAULT_DEPS = "1" - libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo" @@ -58,8 +51,6 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ 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/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 985df1dfaa..1319fb33d3 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -8,7 +8,6 @@ PR = "r13" DEFAULT_PREFERENCE_sh3="-1" GLIBC_ADDONS ?= "ports,linuxthreads" -GLIBC_EXTRA_OECONF ?= "" GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN" @@ -28,12 +27,7 @@ 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 @@ -71,8 +65,6 @@ SRC_URI_append_sh4 = " file://no-z-defs.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 \ diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 4cf0b82b92..3752da1040 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -14,7 +14,6 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" 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" @@ -34,12 +33,7 @@ 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 @@ -76,8 +70,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/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index f9f24bbe7f..1dc0a240bb 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -15,7 +15,6 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" 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" @@ -35,12 +34,7 @@ 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 @@ -79,8 +73,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/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index c85aa500f1..0ddcb8a447 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -5,7 +5,6 @@ PR = "r5" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" -GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" @@ -25,11 +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" -INHIBIT_DEFAULT_DEPS = "1" RDEPENDS_${PN}-dev = "linux-libc-headers-dev" # file://noinfo.patch;patch=1 @@ -58,8 +52,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 \ |