diff options
author | Richard Purdie <richard@openedhand.com> | 2007-10-29 21:13:42 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-10-29 21:13:42 +0000 |
commit | 4894e1380e1ebe62b13c3ac051cc235de33e38f5 (patch) | |
tree | 81873e9ed6197ba8b396f389903a680b1310895b /meta/packages/glibc | |
parent | 6a97ee543a3e1ec9398b8a009f4a6324cdfab2a2 (diff) | |
download | poky-4894e1380e1ebe62b13c3ac051cc235de33e38f5.tar.gz |
glibc: Factor staging function into a common .inc file
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3028 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/glibc')
-rw-r--r-- | meta/packages/glibc/glibc-stage.inc | 23 | ||||
-rw-r--r-- | meta/packages/glibc/glibc_2.3.5+cvs20050627.bb | 24 | ||||
-rw-r--r-- | meta/packages/glibc/glibc_2.4.bb | 24 | ||||
-rw-r--r-- | meta/packages/glibc/glibc_2.5.bb | 24 | ||||
-rw-r--r-- | meta/packages/glibc/glibc_csl-2005q3-2.bb | 24 |
5 files changed, 27 insertions, 92 deletions
diff --git a/meta/packages/glibc/glibc-stage.inc b/meta/packages/glibc/glibc-stage.inc new file mode 100644 index 0000000000..a86cf7888e --- /dev/null +++ b/meta/packages/glibc/glibc-stage.inc | |||
@@ -0,0 +1,23 @@ | |||
1 | do_stage() { | ||
2 | rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6 | ||
3 | oe_runmake 'install_root=${STAGING_DIR_HOST}' \ | ||
4 | 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \ | ||
5 | '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \ | ||
6 | install-headers install-lib | ||
7 | |||
8 | install -d ${STAGING_INCDIR}/gnu \ | ||
9 | ${STAGING_INCDIR}/bits \ | ||
10 | ${STAGING_INCDIR}/rpcsvc | ||
11 | install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ | ||
12 | install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ | ||
13 | install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h | ||
14 | for r in ${rpcsvc}; do | ||
15 | h=`echo $r|sed -e's,\.x$,.h,'` | ||
16 | install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ | ||
17 | done | ||
18 | for i in libc.a libc_pic.a libc_nonshared.a; do | ||
19 | install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i" | ||
20 | done | ||
21 | echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so | ||
22 | echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so | ||
23 | } | ||
diff --git a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb index e2a2119f2e..242274b609 100644 --- a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb | |||
@@ -119,29 +119,7 @@ do_compile () { | |||
119 | ) | 119 | ) |
120 | } | 120 | } |
121 | 121 | ||
122 | do_stage() { | 122 | require glibc-stage.inc |
123 | rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6 | ||
124 | oe_runmake 'install_root=${STAGING_DIR_HOST}' \ | ||
125 | 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \ | ||
126 | '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \ | ||
127 | install-headers install-lib | ||
128 | |||
129 | install -d ${STAGING_INCDIR}/gnu \ | ||
130 | ${STAGING_INCDIR}/bits \ | ||
131 | ${STAGING_INCDIR}/rpcsvc | ||
132 | install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ | ||
133 | install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ | ||
134 | install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h | ||
135 | for r in ${rpcsvc}; do | ||
136 | h=`echo $r|sed -e's,\.x$,.h,'` | ||
137 | install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ | ||
138 | done | ||
139 | for i in libc.a libc_pic.a libc_nonshared.a; do | ||
140 | install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i" | ||
141 | done | ||
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_DIR_HOST}/${layout_base_libdir}/libc.so | ||
144 | } | ||
145 | 123 | ||
146 | require glibc-package.bbclass | 124 | require glibc-package.bbclass |
147 | include glibc.inc | 125 | include glibc.inc |
diff --git a/meta/packages/glibc/glibc_2.4.bb b/meta/packages/glibc/glibc_2.4.bb index a079308418..a8e6f740ad 100644 --- a/meta/packages/glibc/glibc_2.4.bb +++ b/meta/packages/glibc/glibc_2.4.bb | |||
@@ -148,28 +148,6 @@ do_compile () { | |||
148 | ) | 148 | ) |
149 | } | 149 | } |
150 | 150 | ||
151 | do_stage() { | 151 | require glibc-stage.inc |
152 | rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6 | ||
153 | oe_runmake 'install_root=${STAGING_DIR_HOST}' \ | ||
154 | 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \ | ||
155 | '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \ | ||
156 | install-headers install-lib | ||
157 | |||
158 | install -d ${STAGING_INCDIR}/gnu \ | ||
159 | ${STAGING_INCDIR}/bits \ | ||
160 | ${STAGING_INCDIR}/rpcsvc | ||
161 | install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ | ||
162 | install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ | ||
163 | install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h | ||
164 | for r in ${rpcsvc}; do | ||
165 | h=`echo $r|sed -e's,\.x$,.h,'` | ||
166 | install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ | ||
167 | done | ||
168 | for i in libc.a libc_pic.a libc_nonshared.a; do | ||
169 | install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i" | ||
170 | done | ||
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_DIR_HOST}/${layout_base_libdir}/libc.so | ||
173 | } | ||
174 | 152 | ||
175 | require glibc-package.bbclass | 153 | require glibc-package.bbclass |
diff --git a/meta/packages/glibc/glibc_2.5.bb b/meta/packages/glibc/glibc_2.5.bb index f41321372a..ccac98fcae 100644 --- a/meta/packages/glibc/glibc_2.5.bb +++ b/meta/packages/glibc/glibc_2.5.bb | |||
@@ -151,28 +151,6 @@ do_compile () { | |||
151 | ) | 151 | ) |
152 | } | 152 | } |
153 | 153 | ||
154 | do_stage() { | 154 | require glibc-stage.inc |
155 | rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6 | ||
156 | oe_runmake 'install_root=${STAGING_DIR_HOST}' \ | ||
157 | 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \ | ||
158 | '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \ | ||
159 | install-headers install-lib | ||
160 | |||
161 | install -d ${STAGING_INCDIR}/gnu \ | ||
162 | ${STAGING_INCDIR}/bits \ | ||
163 | ${STAGING_INCDIR}/rpcsvc | ||
164 | install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ | ||
165 | install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ | ||
166 | install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h | ||
167 | for r in ${rpcsvc}; do | ||
168 | h=`echo $r|sed -e's,\.x$,.h,'` | ||
169 | install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ | ||
170 | done | ||
171 | for i in libc.a libc_pic.a libc_nonshared.a; do | ||
172 | install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir} || die "failed to install $i" | ||
173 | done | ||
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_DIR_HOST}/${layout_base_libdir}/libc.so | ||
176 | } | ||
177 | 155 | ||
178 | require glibc-package.bbclass | 156 | require glibc-package.bbclass |
diff --git a/meta/packages/glibc/glibc_csl-2005q3-2.bb b/meta/packages/glibc/glibc_csl-2005q3-2.bb index 8af447091b..a28c0b2361 100644 --- a/meta/packages/glibc/glibc_csl-2005q3-2.bb +++ b/meta/packages/glibc/glibc_csl-2005q3-2.bb | |||
@@ -99,28 +99,6 @@ do_compile () { | |||
99 | ) | 99 | ) |
100 | } | 100 | } |
101 | 101 | ||
102 | do_stage() { | 102 | require glibc-stage.inc |
103 | rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6 | ||
104 | oe_runmake 'install_root=${STAGING_DIR_HOST}' \ | ||
105 | 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \ | ||
106 | '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \ | ||
107 | install-headers install-lib | ||
108 | |||
109 | install -d ${STAGING_INCDIR}/gnu \ | ||
110 | ${STAGING_INCDIR}/bits \ | ||
111 | ${STAGING_INCDIR}/rpcsvc | ||
112 | install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ | ||
113 | install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ | ||
114 | install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h | ||
115 | for r in ${rpcsvc}; do | ||
116 | h=`echo $r|sed -e's,\.x$,.h,'` | ||
117 | install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ | ||
118 | done | ||
119 | for i in libc.a libc_pic.a libc_nonshared.a; do | ||
120 | install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir} || die "failed to install $i" | ||
121 | done | ||
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_DIR_HOST}/${layout_base_libdir}/libc.so | ||
124 | } | ||
125 | 103 | ||
126 | require glibc-package.bbclass | 104 | require glibc-package.bbclass |