summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/glibc/glibc-initial.inc8
-rw-r--r--meta/packages/glibc/glibc_2.3.5+cvs20050627.bb14
-rw-r--r--meta/packages/glibc/glibc_2.4.bb18
-rw-r--r--meta/packages/glibc/glibc_2.5.bb18
-rw-r--r--meta/packages/glibc/glibc_csl-2005q3-2.bb18
5 files changed, 38 insertions, 38 deletions
diff --git a/meta/packages/glibc/glibc-initial.inc b/meta/packages/glibc/glibc-initial.inc
index 9355320b3a..288cb082a5 100644
--- a/meta/packages/glibc/glibc-initial.inc
+++ b/meta/packages/glibc/glibc-initial.inc
@@ -30,14 +30,14 @@ do_compile () {
30} 30}
31 31
32do_stage () { 32do_stage () {
33 oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers 33 oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir='${layout_includedir}' prefix='${layout_prefix}' install-headers
34 34
35 # Two headers -- stubs.h and features.h -- aren't installed by install-headers, 35 # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
36 # so do them by hand. We can tolerate an empty stubs.h for the moment. 36 # so do them by hand. We can tolerate an empty stubs.h for the moment.
37 # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html 37 # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
38 mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu 38 mkdir -p ${STAGING_INCDIR}/gnu
39 touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h 39 touch ${STAGING_INCDIR}/gnu/stubs.h
40 cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h 40 cp ${S}/include/features.h ${STAGING_INCDIR}/features.h
41} 41}
42 42
43do_install () { 43do_install () {
diff --git a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
index a7bf9b9582..e2a2119f2e 100644
--- a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -120,10 +120,10 @@ do_compile () {
120} 120}
121 121
122do_stage() { 122do_stage() {
123 rm -f ${STAGING_LIBDIR}/libc.so.6 123 rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
124 oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ 124 oe_runmake 'install_root=${STAGING_DIR_HOST}' \
125 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ 125 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
126 '${STAGING_LIBDIR}/libc.so.6' \ 126 '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
127 install-headers install-lib 127 install-headers install-lib
128 128
129 install -d ${STAGING_INCDIR}/gnu \ 129 install -d ${STAGING_INCDIR}/gnu \
@@ -137,10 +137,10 @@ do_stage() {
137 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ 137 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
138 done 138 done
139 for i in libc.a libc_pic.a libc_nonshared.a; do 139 for i in libc.a libc_pic.a libc_nonshared.a; do
140 install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i" 140 install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
141 done 141 done
142 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so 142 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so
143 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so 143 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
144} 144}
145 145
146require glibc-package.bbclass 146require glibc-package.bbclass
diff --git a/meta/packages/glibc/glibc_2.4.bb b/meta/packages/glibc/glibc_2.4.bb
index c62c80aaf9..a079308418 100644
--- a/meta/packages/glibc/glibc_2.4.bb
+++ b/meta/packages/glibc/glibc_2.4.bb
@@ -7,8 +7,8 @@ PRIORITY = "required"
7PR = "r11" 7PR = "r11"
8 8
9# the -isystem in bitbake.conf screws up glibc do_stage 9# the -isystem in bitbake.conf screws up glibc do_stage
10BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" 10BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
11TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" 11TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
12 12
13 13
14FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" 14FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
@@ -149,10 +149,10 @@ do_compile () {
149} 149}
150 150
151do_stage() { 151do_stage() {
152 rm -f ${STAGING_LIBDIR}/libc.so.6 152 rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
153 oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ 153 oe_runmake 'install_root=${STAGING_DIR_HOST}' \
154 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ 154 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
155 '${STAGING_LIBDIR}/libc.so.6' \ 155 '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
156 install-headers install-lib 156 install-headers install-lib
157 157
158 install -d ${STAGING_INCDIR}/gnu \ 158 install -d ${STAGING_INCDIR}/gnu \
@@ -166,10 +166,10 @@ do_stage() {
166 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ 166 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
167 done 167 done
168 for i in libc.a libc_pic.a libc_nonshared.a; do 168 for i in libc.a libc_pic.a libc_nonshared.a; do
169 install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i" 169 install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
170 done 170 done
171 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so 171 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so
172 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so 172 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
173} 173}
174 174
175require glibc-package.bbclass 175require glibc-package.bbclass
diff --git a/meta/packages/glibc/glibc_2.5.bb b/meta/packages/glibc/glibc_2.5.bb
index 6432aefb8c..f41321372a 100644
--- a/meta/packages/glibc/glibc_2.5.bb
+++ b/meta/packages/glibc/glibc_2.5.bb
@@ -3,8 +3,8 @@ require glibc.inc
3PR = "r5" 3PR = "r5"
4 4
5# the -isystem in bitbake.conf screws up glibc do_stage 5# the -isystem in bitbake.conf screws up glibc do_stage
6BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" 6BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
7TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" 7TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
8 8
9 9
10FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" 10FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
@@ -152,10 +152,10 @@ do_compile () {
152} 152}
153 153
154do_stage() { 154do_stage() {
155 rm -f ${STAGING_LIBDIR}/libc.so.6 155 rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
156 oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ 156 oe_runmake 'install_root=${STAGING_DIR_HOST}' \
157 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ 157 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
158 '${STAGING_LIBDIR}/libc.so.6' \ 158 '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
159 install-headers install-lib 159 install-headers install-lib
160 160
161 install -d ${STAGING_INCDIR}/gnu \ 161 install -d ${STAGING_INCDIR}/gnu \
@@ -169,10 +169,10 @@ do_stage() {
169 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ 169 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
170 done 170 done
171 for i in libc.a libc_pic.a libc_nonshared.a; do 171 for i in libc.a libc_pic.a libc_nonshared.a; do
172 install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i" 172 install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir} || die "failed to install $i"
173 done 173 done
174 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so 174 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so
175 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so 175 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
176} 176}
177 177
178require glibc-package.bbclass 178require glibc-package.bbclass
diff --git a/meta/packages/glibc/glibc_csl-2005q3-2.bb b/meta/packages/glibc/glibc_csl-2005q3-2.bb
index 5c9fd333c2..8af447091b 100644
--- a/meta/packages/glibc/glibc_csl-2005q3-2.bb
+++ b/meta/packages/glibc/glibc_csl-2005q3-2.bb
@@ -8,8 +8,8 @@ PV = "2.3.6+csl-arm-2005q3-2"
8PR = "r11" 8PR = "r11"
9 9
10# the -isystem in bitbake.conf screws up glibc do_stage 10# the -isystem in bitbake.conf screws up glibc do_stage
11BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" 11BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
12TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" 12TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
13 13
14FILESDIR = "${FILE_DIRNAME}/files" 14FILESDIR = "${FILE_DIRNAME}/files"
15 15
@@ -100,10 +100,10 @@ do_compile () {
100} 100}
101 101
102do_stage() { 102do_stage() {
103 rm -f ${STAGING_LIBDIR}/libc.so.6 103 rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
104 oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ 104 oe_runmake 'install_root=${STAGING_DIR_HOST}' \
105 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ 105 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
106 '${STAGING_LIBDIR}/libc.so.6' \ 106 '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
107 install-headers install-lib 107 install-headers install-lib
108 108
109 install -d ${STAGING_INCDIR}/gnu \ 109 install -d ${STAGING_INCDIR}/gnu \
@@ -117,10 +117,10 @@ do_stage() {
117 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ 117 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
118 done 118 done
119 for i in libc.a libc_pic.a libc_nonshared.a; do 119 for i in libc.a libc_pic.a libc_nonshared.a; do
120 install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i" 120 install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir} || die "failed to install $i"
121 done 121 done
122 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so 122 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so
123 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so 123 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
124} 124}
125 125
126require glibc-package.bbclass 126require glibc-package.bbclass