summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-10-29 21:28:10 +0000
committerRichard Purdie <richard@openedhand.com>2007-10-29 21:28:10 +0000
commita6314a0f40010a1e6c0216083c93a28028c955df (patch)
tree421d2722023656a3c7b3adfe521147bf44d36256 /meta
parent4894e1380e1ebe62b13c3ac051cc235de33e38f5 (diff)
downloadpoky-a6314a0f40010a1e6c0216083c93a28028c955df.tar.gz
glibc: Sync glibc.inc cleanup from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3029 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/glibc/glibc-initial_2.4.bb1
-rw-r--r--meta/packages/glibc/glibc.inc17
-rw-r--r--meta/packages/glibc/glibc_2.3.5+cvs20050627.bb17
-rw-r--r--meta/packages/glibc/glibc_2.4.bb19
-rw-r--r--meta/packages/glibc/glibc_2.5.bb11
-rw-r--r--meta/packages/glibc/glibc_csl-2005q3-2.bb17
6 files changed, 22 insertions, 60 deletions
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 @@
1require glibc_${PV}.bb 1require glibc_${PV}.bb
2require glibc-initial.inc 2require glibc-initial.inc
3
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 @@
1DESCRIPTION = "GNU C Library"
2HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
3SECTION = "libs"
4PRIORITY = "required"
5LICENSE = "LGPL"
6# nptl needs unwind support in gcc, which can't be built without glibc.
7DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
8RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
9#this leads to circular deps, so lets not add it yet
10#RDEPENDS_ldd += " bash"
11PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
12PROVIDES += "virtual/libintl virtual/libiconv"
13
14inherit autotools
15
16GLIBC_EXTRA_OECONF ?= ""
17INHIBIT_DEFAULT_DEPS = "1"
1 18
2do_rig_locales() { 19do_rig_locales() {
3 # If indicated, only build a limited selection of locales 20 # 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 @@
1DESCRIPTION = "GNU C Library" 1require glibc.inc
2HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
3LICENSE = "LGPL"
4SECTION = "libs"
5PRIORITY = "required"
6 2
7FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" 3FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
8SRCDATE = "20050627" 4SRCDATE = "20050627"
9PR = "r4" 5PR = "r4"
10 6
11GLIBC_ADDONS ?= "ports,linuxthreads" 7GLIBC_ADDONS ?= "ports,linuxthreads"
12GLIBC_EXTRA_OECONF ?= ""
13 8
14GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN" 9GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN"
15 10
@@ -29,13 +24,6 @@ python __anonymous () {
29 bb.data.getVar('TARGET_OS', d, 1)) 24 bb.data.getVar('TARGET_OS', d, 1))
30} 25}
31 26
32# nptl needs unwind support in gcc, which can't be built without glibc.
33PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
34PROVIDES += "virtual/libintl virtual/libiconv"
35DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
36RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
37INHIBIT_DEFAULT_DEPS = "1"
38
39# file://noinfo.patch;patch=1 27# file://noinfo.patch;patch=1
40# file://ldconfig.patch;patch=1;pnum=0 28# file://ldconfig.patch;patch=1;pnum=0
41# file://arm-machine-gmon.patch;patch=1;pnum=0 \ 29# file://arm-machine-gmon.patch;patch=1;pnum=0 \
@@ -62,8 +50,6 @@ SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
62S = "${WORKDIR}/libc" 50S = "${WORKDIR}/libc"
63B = "${WORKDIR}/build-${TARGET_SYS}" 51B = "${WORKDIR}/build-${TARGET_SYS}"
64 52
65inherit autotools
66
67EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ 53EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
68 --without-cvs --disable-profile --disable-debug --without-gd \ 54 --without-cvs --disable-profile --disable-debug --without-gd \
69 --enable-clocale=gnu \ 55 --enable-clocale=gnu \
@@ -122,4 +108,3 @@ do_compile () {
122require glibc-stage.inc 108require glibc-stage.inc
123 109
124require glibc-package.bbclass 110require glibc-package.bbclass
125include 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 @@
1DESCRIPTION = "GNU C Library" 1require glibc.inc
2HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" 2
3LICENSE = "LGPL"
4SECTION = "libs"
5PRIORITY = "required"
6# DEFAULT_PREFERENCE = "-1"
7PR = "r11" 3PR = "r11"
8 4
9# the -isystem in bitbake.conf screws up glibc do_stage 5# the -isystem in bitbake.conf screws up glibc do_stage
10BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 6BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
11TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" 7TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
12 8
13
14FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" 9FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
15 10
16GLIBC_ADDONS ?= "ports,nptl,libidn" 11GLIBC_ADDONS ?= "ports,nptl,libidn"
17GLIBC_EXTRA_OECONF ?= ""
18 12
19GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET bn_BD gez_ER te_IN" 13GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET bn_BD gez_ER te_IN"
20 14
@@ -34,13 +28,6 @@ python __anonymous () {
34 bb.data.getVar('TARGET_OS', d, 1)) 28 bb.data.getVar('TARGET_OS', d, 1))
35} 29}
36 30
37# nptl needs unwind support in gcc, which can't be built without glibc.
38PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
39PROVIDES += "virtual/libintl virtual/libiconv"
40DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
41RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
42INHIBIT_DEFAULT_DEPS = "1"
43
44# file://noinfo.patch;patch=1 31# file://noinfo.patch;patch=1
45# file://ldconfig.patch;patch=1;pnum=0 32# file://ldconfig.patch;patch=1;pnum=0
46# file://arm-machine-gmon.patch;patch=1;pnum=0 \ 33# file://arm-machine-gmon.patch;patch=1;pnum=0 \
@@ -73,8 +60,6 @@ SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
73S = "${WORKDIR}/glibc-2.4" 60S = "${WORKDIR}/glibc-2.4"
74B = "${WORKDIR}/build-${TARGET_SYS}" 61B = "${WORKDIR}/build-${TARGET_SYS}"
75 62
76inherit autotools
77
78EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ 63EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
79 --without-cvs --disable-profile --disable-debug --without-gd \ 64 --without-cvs --disable-profile --disable-debug --without-gd \
80 --enable-clocale=gnu \ 65 --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"
6BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 6BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
7TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" 7TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
8 8
9
10FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" 9FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
11 10
12GLIBC_ADDONS ?= "ports,nptl,libidn" 11GLIBC_ADDONS ?= "ports,nptl,libidn"
13GLIBC_EXTRA_OECONF ?= ""
14 12
15GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" 13GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN"
16 14
@@ -30,13 +28,6 @@ python __anonymous () {
30 bb.data.getVar('TARGET_OS', d, 1)) 28 bb.data.getVar('TARGET_OS', d, 1))
31} 29}
32 30
33# nptl needs unwind support in gcc, which can't be built without glibc.
34PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
35PROVIDES += "virtual/libintl virtual/libiconv"
36DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
37RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
38INHIBIT_DEFAULT_DEPS = "1"
39
40# file://noinfo.patch;patch=1 31# file://noinfo.patch;patch=1
41# file://ldconfig.patch;patch=1;pnum=0 32# file://ldconfig.patch;patch=1;pnum=0
42# file://arm-machine-gmon.patch;patch=1;pnum=0 \ 33# file://arm-machine-gmon.patch;patch=1;pnum=0 \
@@ -74,8 +65,6 @@ SRC_URI_append_powerpc = " file://powerpc-sqrt-hack.diff;patch=1"
74S = "${WORKDIR}/glibc-${PV}" 65S = "${WORKDIR}/glibc-${PV}"
75B = "${WORKDIR}/build-${TARGET_SYS}" 66B = "${WORKDIR}/build-${TARGET_SYS}"
76 67
77inherit autotools
78
79EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ 68EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
80 --without-cvs --disable-profile --disable-debug --without-gd \ 69 --without-cvs --disable-profile --disable-debug --without-gd \
81 --enable-clocale=gnu \ 70 --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 @@
1DESCRIPTION = "GNU C Library" 1require glibc.inc
2HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" 2
3LICENSE = "LGPL"
4SECTION = "libs"
5PRIORITY = "required"
6# DEFAULT_PREFERENCE = "-1" 3# DEFAULT_PREFERENCE = "-1"
7PV = "2.3.6+csl-arm-2005q3-2" 4PV = "2.3.6+csl-arm-2005q3-2"
8PR = "r11" 5PR = "r11"
@@ -14,7 +11,6 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
14FILESDIR = "${FILE_DIRNAME}/files" 11FILESDIR = "${FILE_DIRNAME}/files"
15 12
16GLIBC_ADDONS ?= "nptl,libidn" 13GLIBC_ADDONS ?= "nptl,libidn"
17GLIBC_EXTRA_OECONF ?= ""
18 14
19GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET bn_BD gez_ER te_IN" 15GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET bn_BD gez_ER te_IN"
20 16
@@ -34,13 +30,6 @@ python __anonymous () {
34 bb.data.getVar('TARGET_OS', d, 1)) 30 bb.data.getVar('TARGET_OS', d, 1))
35} 31}
36 32
37# nptl needs unwind support in gcc, which can't be built without glibc.
38PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
39PROVIDES += "virtual/libintl virtual/libiconv"
40DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
41RDEPENDS_${PN}-dev = ""
42INHIBIT_DEFAULT_DEPS = "1"
43
44SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \ 33SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \
45 file://nptl-crosscompile-2.3.6.patch;patch=1 \ 34 file://nptl-crosscompile-2.3.6.patch;patch=1 \
46 file://etc/ld.so.conf \ 35 file://etc/ld.so.conf \
@@ -58,8 +47,6 @@ addtask unpack2 after do_unpack before do_patch
58S = "${WORKDIR}/glibc-2.3.5pre" 47S = "${WORKDIR}/glibc-2.3.5pre"
59B = "${WORKDIR}/build-${TARGET_SYS}" 48B = "${WORKDIR}/build-${TARGET_SYS}"
60 49
61inherit autotools
62
63EXTRA_OECONF = "--without-cvs --disable-profile --disable-debug --without-gd \ 50EXTRA_OECONF = "--without-cvs --disable-profile --disable-debug --without-gd \
64 --enable-clocale=gnu \ 51 --enable-clocale=gnu \
65 --enable-add-ons \ 52 --enable-add-ons \