diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-05-22 12:02:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-23 15:53:28 +0100 |
commit | 4ea8b2fde48134dd58a9876c9ddc21b4b51e78f2 (patch) | |
tree | f0bdb225cabf12d58369be1514cd641ebf05341d /meta/recipes-core/uclibc/uclibc.inc | |
parent | ed6f039bca9bd8da640ba8c76a4751bc818a091b (diff) | |
download | poky-4ea8b2fde48134dd58a9876c9ddc21b4b51e78f2.tar.gz |
uclibc: Upgrade to 0.9.32-rc3
Bring in the uclibc recipes from meta-oe they have been well
tested by now.
Delete 0.9.30.1 recipes
(From OE-Core rev: ac60a936e737680c16b287a3dab6aa285d87c5c0)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/uclibc/uclibc.inc')
-rw-r--r-- | meta/recipes-core/uclibc/uclibc.inc | 284 |
1 files changed, 154 insertions, 130 deletions
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index 5e87cf9550..e7d8846738 100644 --- a/meta/recipes-core/uclibc/uclibc.inc +++ b/meta/recipes-core/uclibc/uclibc.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | SUMMARY = "C library for embedded systems" | 1 | SUMMARY = "C library for embedded systems" |
2 | DESCRIPTION = "The name uClibc is an abbreviation for 'the \ | 2 | DESCRIPTION = "The name uClibc is an abbreviation for 'the \ |
3 | microcontroller C library'. For simplicity, uClibc is pronounced \ | 3 | microcontroller C library'. For simplicity, uClibc is pronounced \ |
4 | 'yew-see-lib-see'. The goal of uClibc is to provide as much \ | 4 | 'yew-see-lib-see'. The goal of uClibc is to provide as much \ |
5 | functionality as possible in a small amount of space, and it is intended \ | 5 | functionality as possible in a small amount of space, and it is intended \ |
6 | primarily for embedded use. It is also highly configurable in supported \ | 6 | primarily for embedded use. It is also highly configurable in supported \ |
@@ -11,6 +11,30 @@ embedded Linux. It is NOT compatible with binaries linked against glibc." | |||
11 | LICENSE = "LGPL" | 11 | LICENSE = "LGPL" |
12 | SECTION = "libs" | 12 | SECTION = "libs" |
13 | PRIORITY = "required" | 13 | PRIORITY = "required" |
14 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | ||
15 | file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \ | ||
16 | file://${S}/test/regex/testregex.c;startline=1;endline=31;md5=234efb227d0a40677f895e4a1e26e960" | ||
17 | INC_PR = "r2" | ||
18 | |||
19 | require uclibc-config.inc | ||
20 | STAGINGCC = "gcc-cross-intermediate" | ||
21 | STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate" | ||
22 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" | ||
23 | |||
24 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | ||
25 | |||
26 | # siteconfig.bbclass runs configure which needs a working compiler | ||
27 | # For the compiler to work we need a working libc yet libc isn't | ||
28 | # in the sysroots directory at this point. This means the libc.so | ||
29 | # linker script won't work as the --sysroot setting isn't correct. | ||
30 | # Here we create a hacked up libc linker script and pass in the right | ||
31 | # flags to let configure work. Ugly. | ||
32 | EXTRASITECONFIG = "CFLAGS='${CFLAGS} -Wl,-L${WORKDIR}/site_config_libc -L${WORKDIR}/site_config_libc -L${SYSROOT_DESTDIR}${libdir} -L${SYSROOT_DESTDIR}${base_libdir} -Wl,-L${SYSROOT_DESTDIR}${libdir} -Wl,-L${SYSROOT_DESTDIR}${base_libdir}'" | ||
33 | siteconfig_do_siteconfig_gencache_prepend = " \ | ||
34 | mkdir -p ${WORKDIR}/site_config_libc; \ | ||
35 | cp ${SYSROOT_DESTDIR}${libdir}/libc.so ${WORKDIR}/site_config_libc; \ | ||
36 | sed -i -e 's# ${base_libdir}# ${SYSROOT_DESTDIR}${base_libdir}#g' -e 's# ${libdir}# ${SYSROOT_DESTDIR}${libdir}#g' ${WORKDIR}/site_config_libc/libc.so; \ | ||
37 | " | ||
14 | 38 | ||
15 | # | 39 | # |
16 | # For now, we will skip building of a gcc package if it is a uclibc one | 40 | # For now, we will skip building of a gcc package if it is a uclibc one |
@@ -27,165 +51,165 @@ python __anonymous () { | |||
27 | raise bb.parse.SkipPackage("incompatible with target %s" % | 51 | raise bb.parse.SkipPackage("incompatible with target %s" % |
28 | bb.data.getVar('TARGET_OS', d, 1)) | 52 | bb.data.getVar('TARGET_OS', d, 1)) |
29 | } | 53 | } |
30 | |||
31 | PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" | 54 | PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" |
32 | PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']}" | ||
33 | DEPENDS = "virtual/${TARGET_PREFIX}binutils \ | 55 | DEPENDS = "virtual/${TARGET_PREFIX}binutils \ |
34 | virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers ncurses-native pax-utils-native" | 56 | virtual/${TARGET_PREFIX}gcc-intermediate \ |
57 | linux-libc-headers ncurses-native" | ||
35 | RDEPENDS_${PN}-dev = "linux-libc-headers-dev" | 58 | RDEPENDS_${PN}-dev = "linux-libc-headers-dev" |
36 | 59 | ||
37 | # Blackfin needs a wrapper around ld | ||
38 | #DEPENDS_append_bfin = " elf2flt " | ||
39 | |||
40 | INHIBIT_DEFAULT_DEPS = "1" | 60 | INHIBIT_DEFAULT_DEPS = "1" |
41 | PARALLEL_MAKE = "" | ||
42 | 61 | ||
43 | PACKAGES =+ "ldd uclibc-utils-dbg uclibc-utils uclibc-gconv uclibc-thread-db" | 62 | PACKAGES =+ "ldd uclibc-utils-dbg uclibc-utils uclibc-gconv uclibc-thread-db uclibc-argp uclibc-backtrace" |
44 | 63 | ||
45 | LEAD_SONAME = "libc.so" | 64 | LEAD_SONAME = "libc.so" |
46 | 65 | ||
47 | # The last line (gdb and lib1) is for uclinux-uclibc builds | 66 | # The last line (gdb and lib1) is for uclinux-uclibc builds |
48 | uclibc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so \ | 67 | uclibc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so \ |
49 | ${base_libdir}/libintl*.so.* ${base_libdir}/libintl-*.so \ | 68 | ${base_libdir}/libintl*.so.* ${base_libdir}/libintl-*.so \ |
50 | ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so \ | 69 | ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so \ |
51 | ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so \ | 70 | ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so \ |
52 | ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so \ | 71 | ${base_libdir}/ld*.so.* ${base_libdir}/ld*.so \ |
53 | ${base_libdir}/libc*.so.* ${base_libdir}/libuClibc-*.so \ | 72 | ${base_libdir}/libc*.so.* ${base_libdir}/libuClibc-*.so \ |
54 | ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so \ | 73 | ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so \ |
55 | ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so \ | 74 | ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so \ |
56 | ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so \ | 75 | ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so \ |
57 | ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so \ | 76 | ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so \ |
58 | ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so \ | 77 | ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so \ |
59 | ${libdir}/libc.gdb ${libdir}/libc ${base_libdir}/lib1.so \ | 78 | ${libdir}/libc.gdb ${libdir}/libc ${base_libdir}/lib1.so \ |
60 | " | 79 | " |
61 | FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \ | 80 | FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \ |
62 | ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale" | 81 | ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale" |
63 | FILES_ldd = "${bindir}/ldd" | 82 | FILES_ldd = "${bindir}/ldd" |
64 | FILES_uclibc-dev += "${libdir}/*.o" | 83 | FILES_uclibc-dev_append = "\ |
84 | ${libdir}/lib*.so \ | ||
85 | ${libdir}/*_nonshared.a \ | ||
86 | ${libdir}/[S]*crt[1in].o \ | ||
87 | ${libdir}/crtreloc*.o \ | ||
88 | ${libdir}/lib*.a \ | ||
89 | ${includedir}/*.h ${includedir}/*/*.h \ | ||
90 | " | ||
65 | FILES_uclibc-utils = "${bindir} ${sbindir}" | 91 | FILES_uclibc-utils = "${bindir} ${sbindir}" |
66 | FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug" | 92 | FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug" |
67 | FILES_uclibc-gconv = "${libdir}/gconv" | 93 | FILES_uclibc-gconv = "${libdir}/gconv" |
68 | FILES_uclibc-thread-db = "/lib/libthread_db*" | 94 | FILES_uclibc-thread-db = "${base_libdir}/libthread_db*" |
69 | RPROVIDES_uclibc-dev += "libc-dev" | 95 | FILES_uclibc-argp = "${base_libdir}/libuargp-*.so ${base_libdir}/libuargp*.so.*" |
96 | FILES_uclibc-backtrace = "${base_libdir}/libubacktrace-*.so ${base_libdir}/libubacktrace*.so.*" | ||
97 | |||
98 | RPROVIDES_uclibc-dev += "libc-dev virtual-libc-dev" | ||
99 | # uclibc does not really have libsegfault but then using the one from glibc is also not | ||
100 | # going to work. So we pretend that we have it to make bitbake not pull other recipes | ||
101 | # to satisfy this dependency for the images/tasks | ||
102 | RPROVIDES_${PN} += "libsegfault" | ||
103 | |||
104 | SRC_URI = "\ | ||
105 | http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2;name=uClibc-${PV} \ | ||
106 | " | ||
107 | |||
108 | # do_stage barfs on a CC with whitespace, therefore put the 'HOST_CC_ARCH' in | ||
109 | # the CFLAGS (when building the utils). | ||
110 | OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}'" | ||
111 | EXTRA_OEMAKE = "${OEMAKE_NO_CC} \ | ||
112 | 'HOSTCC=${BUILD_CC}' \ | ||
113 | 'HOST_CFLAGS=${BUILD_CFLAGS}' \ | ||
114 | 'CC=${CC}' \ | ||
115 | ARCH=${UCLIBC_ARCH}" | ||
70 | 116 | ||
71 | # | ||
72 | # This locale file gets copied into uClibc-${PV}/extra/locale/ prior to | ||
73 | # build, it does not need to be unpacked, but we can't inhibit the unpacking | ||
74 | # in the current build system. | ||
75 | # | ||
76 | UCLIBC_LOCALE_FILE = "uClibc-locale-030818.tgz" | ||
77 | UCLIBC_LOCALE_FILE_arm = "uClibc-locale-030818.arm.tgz" | ||
78 | UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}" | ||
79 | UCLIBC_LOCALE_URI_arm = "http://wiki.openembedded.net/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}" | ||
80 | |||
81 | SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ | ||
82 | file://uClibc.config \ | ||
83 | http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \ | ||
84 | " | ||
85 | |||
86 | # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in | ||
87 | # the CFLAGS (for when building the utils). | ||
88 | OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}' \ | ||
89 | 'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'" | ||
90 | EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' \ | ||
91 | 'HOSTCFLAGS=-I${STAGING_INCDIR_NATIVE}' \ | ||
92 | ARCH=`grep TARGET_ARCH ${S}/.config|sed -e 's/TARGET_ARCH=//g'`" | ||
93 | EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}" | 117 | EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}" |
94 | 118 | ||
95 | KERNEL_SOURCE = "${STAGING_INCDIR}" | 119 | # enable verbose output: |
96 | KERNEL_HEADERS = "${STAGING_INCDIR}" | 120 | export V="2" |
97 | |||
98 | # Lets munge this via siteinfo.bbclass as well: | ||
99 | # ARCH_BIG_ENDIAN=y | ||
100 | # ARCH_WANTS_BIG_ENDIAN=y | ||
101 | # ARCH_WANTS_LITTLE_ENDIAN is not set | ||
102 | |||
103 | # How to enable verbose logs: | ||
104 | #export VERBOSE="1" | ||
105 | |||
106 | configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${KERNEL_SOURCE}",g; \ | ||
107 | s,^KERNEL_HEADERS=.*,KERNEL_HEADERS="${KERNEL_HEADERS}",g; \ | ||
108 | s,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX="/",g; \ | ||
109 | s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \ | ||
110 | s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \ | ||
111 | s,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX="/lib",; \ | ||
112 | s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \ | ||
113 | ${@["","s,.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y,;"][bb.data.getVar("USE_NLS", d, 1) == "yes"]} \ | ||
114 | ${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is not set,;"][bb.data.getVar("TARGET_ARCH", d, 1) in ['mips', 'mipsel', 'avr32']]} \ | ||
115 | ' | ||
116 | |||
117 | CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}" | ||
118 | 121 | ||
119 | python () { | 122 | # -O<n> -fno-omit-frame-pointer ends up with GCC ICE on thumb as reported |
120 | if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: | 123 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44860 |
121 | bb.data.setVar('configmangle_append', ' s,^HAS_FPU=y,# HAS_FPU is not set,;', d) | 124 | # |
125 | CFLAGS_arm := "${@oe_filter_out('-fno-omit-frame-pointer', '${CFLAGS}', d)}" | ||
126 | UCLIBC_EXTRA_CFLAGS := "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}" | ||
127 | UCLIBC_EXTRA_LDFLAGS := "${@oe_filter_out('(-L\S+|-l\S+)', '${LDFLAGS}', d)}" | ||
128 | do_compile_prepend () { | ||
129 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | ||
122 | } | 130 | } |
123 | 131 | ||
124 | uclibcbuild_do_patch() { | 132 | configmangle = '/^KERNEL_HEADERS/d; \ |
125 | ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux | 133 | /^RUNTIME_PREFIX/d; \ |
126 | ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm | 134 | /^DEVEL_PREFIX/d; \ |
127 | 135 | /^SHARED_LIB_LOADER_PREFIX/d; \ | |
128 | ${@['cp %s/%s extra/locale' % (bb.data.getVar('DL_DIR', d, 1) or '', bb.data.getVar('UCLIBC_LOCALE_FILE', d, 1) or ''), ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} | 136 | /^UCLIBC_EXTRA_CFLAGS/d; \ |
137 | s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \ | ||
138 | ${@["","s,.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y,;"][bb.data.getVar("USE_NLS", d, 1) == "yes"]} \ | ||
139 | ${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is not set,;"][bb.data.getVar("TARGET_ARCH", d, 1) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]} \ | ||
140 | /^CROSS/d; \ | ||
141 | /^TARGET_ARCH=/d; \ | ||
142 | /^TARGET_/s,^\([^=]*\).*,# \1 is not set,g; \ | ||
143 | s,^DOSTRIP.*,# DOSTRIP is not set,g; \ | ||
144 | /_[EO]*ABI/d; \ | ||
145 | /HAS_FPU/d; \ | ||
146 | ' | ||
147 | OE_FEATURES := "${@features_to_uclibc_conf(d)}" | ||
148 | OE_DEL := "${@features_to_uclibc_del(d)}" | ||
149 | python () { | ||
150 | if "${OE_DEL}": | ||
151 | bb.data.setVar('configmangle_append', "${OE_DEL}" + "\n", d) | ||
152 | if "${OE_FEATURES}": | ||
153 | bb.data.setVar('configmangle_append', | ||
154 | "/^### DISTRO FEATURES$/a\\\n%s\n\n" % | ||
155 | ("\\n".join((bb.data.expand("${OE_FEATURES}", d).split("\n")))), | ||
156 | d) | ||
157 | bb.data.setVar('configmangle_append', | ||
158 | "/^### CROSS$/a\\\n%s\n" % | ||
159 | ("\\n".join(["CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"", | ||
160 | "UCLIBC_EXTRA_CFLAGS=\"${UCLIBC_EXTRA_CFLAGS}\"", | ||
161 | "KERNEL_HEADERS=\"${STAGING_INCDIR}\"", | ||
162 | "RUNTIME_PREFIX=\"/\"", | ||
163 | "DEVEL_PREFIX=\"/${prefix}\"", | ||
164 | "SHARED_LIB_LOADER_PREFIX=\"/lib\"", | ||
165 | ]) | ||
166 | ), | ||
167 | d) | ||
168 | bb.data.setVar('configmangle_append', | ||
169 | "/^### TGT$/a\\\nTARGET_ARCH=\"%s\"\\nTARGET_%s=y\n" % | ||
170 | ("${UCLIBC_ARCH}", "${UCLIBC_ARCH}"), | ||
171 | d) | ||
172 | bb.data.setVar('configmangle_append', | ||
173 | "/^### FPU$/a\\\n%s\n\n" % (["UCLIBC_HAS_FPU=y","# UCLIBC_HAS_FPU is not set"][bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]]), d) | ||
174 | if "${UCLIBC_ENDIAN}": | ||
175 | bb.data.setVar('configmangle_append', | ||
176 | "/^### ABI$/a\\\nARCH_%s_ENDIAN=y\n\n" % ("${UCLIBC_ENDIAN}"), | ||
177 | d) | ||
178 | if "${UCLIBC_ABI}": | ||
179 | bb.data.setVar('configmangle_append', | ||
180 | "/^### ABI$/a\\\nCONFIG_%s=y\n\n" % ("${UCLIBC_ABI}"), | ||
181 | d) | ||
129 | } | 182 | } |
130 | 183 | ||
131 | python do_patch () { | 184 | do_patch_append() { |
132 | bb.build.exec_func('base_do_patch', d) | 185 | os.system("ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux") |
133 | bb.build.exec_func('uclibcbuild_do_patch', d) | 186 | os.system("ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm") |
134 | } | 187 | } |
135 | 188 | ||
136 | do_configure() { | 189 | do_configure() { |
137 | rm -f ${S}/.config | 190 | rm -f ${S}/.config |
138 | 191 | ||
139 | # For uClibc 0.9.29, OpenEmbedded splits the uClibc.config in two parts: | 192 | # OpenEmbedded splits the uClibc.config in two parts: |
140 | # uClibc.machine and uClibc.distro. So, if they exist use them, otherwise | 193 | # uClibc.machine, uClibc.distro |
141 | # use a uClibc.config | 194 | echo "### uClibc.machine ###" >${S}/merged.config |
142 | if [ -f ${WORKDIR}/uClibc.machine -a -f ${WORKDIR}/uClibc.distro ]; then | 195 | cat ${WORKDIR}/uClibc.machine >>${S}/merged.config |
143 | echo "### uClibc.machine ###" >${S}/merged.config | 196 | echo "### uClibc.distro ###" >>${S}/merged.config |
144 | cat ${WORKDIR}/uClibc.machine >>${S}/merged.config | 197 | cat ${WORKDIR}/uClibc.distro >>${S}/merged.config |
145 | echo "### uClibc.distro ###" >>${S}/merged.config | 198 | echo "### CROSS" >>${S}/merged.config |
146 | cat ${WORKDIR}/uClibc.distro >>${S}/merged.config | 199 | echo "### TGT" >>${S}/merged.config |
147 | else | 200 | echo "### MMU" >>${S}/merged.config |
148 | echo "### uClibc.config ###" >${S}/merged.config | 201 | echo "### FPU" >>${S}/merged.config |
149 | cat ${WORKDIR}/uClibc.config >>${S}/merged.config | 202 | echo "### ABI" >>${S}/merged.config |
150 | fi | 203 | echo "### DISTRO FEATURES" >>${S}/merged.config |
151 | cp ${S}/merged.config ${S}/.config | 204 | cp ${S}/merged.config ${S}/.config |
152 | 205 | ||
153 | # Mangle the resulting .config depending on OE variables | 206 | # Mangle the resulting .config depending on OE variables |
154 | perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak | 207 | sed -i -e '${configmangle}' ${S}/.config |
155 | sed -i -e s:'$(CROSS)strip':true: ${S}/Rules.mak | 208 | |
156 | perl -i -p -e '${configmangle}' ${S}/.config | 209 | oe_runmake oldconfig |
157 | |||
158 | sed -i -e '/CONFIG_ARM_EABI/d' ${S}/.config | ||
159 | |||
160 | if [ `echo ${TARGET_ARCH} | grep -e '^arm'` ]; then | ||
161 | if [ `echo ${TARGET_OS} | grep -e 'eabi$'` ]; then | ||
162 | echo "CONFIG_ARM_EABI=y" >> ${S}/.config | ||
163 | else | ||
164 | echo "# CONFIG_ARM_EABI is not set" >> ${S}/.config | ||
165 | fi | ||
166 | fi | ||
167 | yes '' | oe_runmake oldconfig | ||
168 | } | 210 | } |
169 | 211 | ||
170 | do_install() { | 212 | do_install() { |
171 | oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ | 213 | oe_runmake PREFIX=${D} install |
172 | install_dev install_runtime | 214 | oe_runmake PREFIX=${D} "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" install_utils |
173 | |||
174 | # Need to overwrite the version from -initial | ||
175 | if [ ! -e ${D}${libdir}/libc.so ]; then | ||
176 | ln -s ../../lib/libc.so.0 ${D}${libdir}/libc.so | ||
177 | fi | ||
178 | |||
179 | # We don't really need this in ${includedir} | ||
180 | rm -f ${D}${prefix}/include/.cvsignore | ||
181 | |||
182 | # This conflicts with the c++ version of this header | ||
183 | rm -f ${D}${prefix}/include/bits/atomicity.h | ||
184 | |||
185 | oe_runmake "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" utils | ||
186 | oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ | ||
187 | install_utils | ||
188 | |||
189 | # oe_runstrip needs +x on files | ||
190 | chmod +x ${D}/${base_libdir}/* | ||
191 | } | 215 | } |