[oe-commits] org.oe.dev glibc: unify this beast some more.
Laibsch commit
openembedded-commits at lists.openembedded.org
Thu Mar 15 20:31:32 UTC 2007
glibc: unify this beast some more.
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 2c516898480b1bc053c9cbf6da853a016059c4c6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2c516898480b1bc053c9cbf6da853a016059c4c6
Files:
1
packages/glibc/glibc.inc
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_cvs.bb
Diffs:
#
# mt diff -r7154bcd10ef672068308f2e456f9ae861bc9a933 -r2c516898480b1bc053c9cbf6da853a016059c4c6
#
#
#
# patch "packages/glibc/glibc.inc"
# from [a46ea5caf65238db7902bb990b29ecea7cf9f676]
# to [04bd84e7ea44c803ddd3735e41396c24902c305f]
#
# patch "packages/glibc/glibc_2.2.5.bb"
# from [23d96e87a40c3ec8d7c2c137868e0d3b66ae2560]
# to [6356af6dc0fee387d496f4113d9a47d31ff19969]
#
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
# from [3a77759f07b33d34833b78b51f9593f97b96df5f]
# to [da9da8bbd7bba0f4afab9bfb2c084c446312aab7]
#
# patch "packages/glibc/glibc_2.3.2.bb"
# from [3fa00a9dea72ec95692b764f1c476b82604b43b7]
# to [6782b7a2e35c5af3ef006ffe3ee0d7f255b0a4d7]
#
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
# from [79351feee4a50a305d1c8a39fb40c24915806292]
# to [68bb875d125161d71d29fe0ec5b9154cf9cad73e]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
# from [aac97c4abaaa86a2a43ce9eb3705bee8df1e35b3]
# to [aca320916a51bba93d34b29a7d980c21fdd654bc]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
# from [f4f95d9a5ca3f202581dbec967fb9f714de3a23e]
# to [f460c6269190d5de4a53f2034fd521c66650b7fd]
#
# patch "packages/glibc/glibc_2.3.3.bb"
# from [6754085cb8001c0300ace28a421c4da16c3ca9a4]
# to [4852c1cb6256dc293b22edffa7f099bc373b27a5]
#
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
# from [b914a13c3ee75a5d012a5f6cf789e2bcb3e2872d]
# to [0bdc803a96e16478f8babc05149bcd358f31b3ba]
#
# patch "packages/glibc/glibc_2.4.bb"
# from [e6f7304f69e4d42bff96850b4650cf7f8b5dae9d]
# to [4dce5800e5ee479d50aadfabe74f8d54c9016194]
#
# patch "packages/glibc/glibc_2.5.bb"
# from [2b99e9d77548a1260cf860d3097b7f00265956c3]
# to [ceae1a8dc9634e2eb511a68c19b48e8bc0b1d590]
#
# patch "packages/glibc/glibc_cvs.bb"
# from [5c691d109faf0a790739e2599a139d1611e3cbc2]
# to [84cb326e8c277c18df0cb035314ecdc612de9cb2]
#
============================================================
--- packages/glibc/glibc.inc a46ea5caf65238db7902bb990b29ecea7cf9f676
+++ packages/glibc/glibc.inc 04bd84e7ea44c803ddd3735e41396c24902c305f
@@ -1,9 +1,18 @@ LICENSE = "LGPL"
DESCRIPTION = "GNU C Library"
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"
============================================================
--- packages/glibc/glibc_2.2.5.bb 23d96e87a40c3ec8d7c2c137868e0d3b66ae2560
+++ packages/glibc/glibc_2.2.5.bb 6356af6dc0fee387d496f4113d9a47d31ff19969
@@ -6,7 +6,6 @@ GLIBC_ADDONS ?= "linuxthreads"
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 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
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 \
============================================================
--- packages/glibc/glibc_2.3.2+cvs20040726.bb 3a77759f07b33d34833b78b51f9593f97b96df5f
+++ packages/glibc/glibc_2.3.2+cvs20040726.bb da9da8bbd7bba0f4afab9bfb2c084c446312aab7
@@ -6,14 +6,7 @@ GLIBC_ADDONS ?= "linuxthreads"
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
SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
@@ -38,8 +31,6 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
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 \
============================================================
--- packages/glibc/glibc_2.3.2.bb 3fa00a9dea72ec95692b764f1c476b82604b43b7
+++ packages/glibc/glibc_2.3.2.bb 6782b7a2e35c5af3ef006ffe3ee0d7f255b0a4d7
@@ -5,7 +5,6 @@ GLIBC_ADDONS ?= "linuxthreads"
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 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
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 \
============================================================
--- packages/glibc/glibc_2.3.3+cvs20041128.bb 79351feee4a50a305d1c8a39fb40c24915806292
+++ packages/glibc/glibc_2.3.3+cvs20041128.bb 68bb875d125161d71d29fe0ec5b9154cf9cad73e
@@ -6,7 +6,6 @@ GLIBC_ADDONS ?= "linuxthreads"
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 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
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 \
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050221.bb aac97c4abaaa86a2a43ce9eb3705bee8df1e35b3
+++ packages/glibc/glibc_2.3.3+cvs20050221.bb aca320916a51bba93d34b29a7d980c21fdd654bc
@@ -6,19 +6,12 @@ GLIBC_ADDONS ?= "linuxthreads"
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 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
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 \
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050420.bb f4f95d9a5ca3f202581dbec967fb9f714de3a23e
+++ packages/glibc/glibc_2.3.3+cvs20050420.bb f460c6269190d5de4a53f2034fd521c66650b7fd
@@ -8,16 +8,9 @@ GLIBC_ADDONS ?= "linuxthreads"
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 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
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 \
============================================================
--- packages/glibc/glibc_2.3.3.bb 6754085cb8001c0300ace28a421c4da16c3ca9a4
+++ packages/glibc/glibc_2.3.3.bb 4852c1cb6256dc293b22edffa7f099bc373b27a5
@@ -8,7 +8,6 @@ GLIBC_ADDONS ?= "linuxthreads"
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 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
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 \
============================================================
--- packages/glibc/glibc_2.3.5+cvs20050627.bb b914a13c3ee75a5d012a5f6cf789e2bcb3e2872d
+++ packages/glibc/glibc_2.3.5+cvs20050627.bb 0bdc803a96e16478f8babc05149bcd358f31b3ba
@@ -8,7 +8,6 @@ GLIBC_ADDONS ?= "ports,linuxthreads"
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 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
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 \
============================================================
--- packages/glibc/glibc_2.4.bb e6f7304f69e4d42bff96850b4650cf7f8b5dae9d
+++ packages/glibc/glibc_2.4.bb 4dce5800e5ee479d50aadfabe74f8d54c9016194
@@ -14,7 +14,6 @@ GLIBC_ADDONS ?= "ports,nptl,libidn"
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 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
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 \
============================================================
--- packages/glibc/glibc_2.5.bb 2b99e9d77548a1260cf860d3097b7f00265956c3
+++ packages/glibc/glibc_2.5.bb ceae1a8dc9634e2eb511a68c19b48e8bc0b1d590
@@ -15,7 +15,6 @@ GLIBC_ADDONS ?= "ports,nptl,libidn"
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}lib%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list