diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-06-28 14:36:53 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-29 13:30:59 +0100 |
commit | c5274b1d255ffbff82a86a5e29b284688344af38 (patch) | |
tree | 97783815e59d2a2a09afbbd6f958138c9d5e590c /meta/recipes-core/uclibc/uclibc.inc | |
parent | cc6a65dfd4b818ecd641410f76f054003767f8a1 (diff) | |
download | poky-c5274b1d255ffbff82a86a5e29b284688344af38.tar.gz |
uclibc: Separate the bits between uclibc and uclibc-initial
uclibc and uclibc-initial were providing conflicting PROVIDES
separate the common bits into logical pieces. Create a common
inc file to hold package information and version specific includes
so correct logical units can be included in uclibc and uclibc-initial
recipes.
(From OE-Core rev: bdfd2f6f286889b8920ebf6a670542b26534c1cb)
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 | 59 |
1 files changed, 1 insertions, 58 deletions
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index 4dae3031df..863bf3a9a5 100644 --- a/meta/recipes-core/uclibc/uclibc.inc +++ b/meta/recipes-core/uclibc/uclibc.inc | |||
@@ -16,10 +16,8 @@ file://${S}/test/regex/testregex.c;startline=1;endline=31;md5=234efb227d0a40677f | |||
16 | INC_PR = "r8" | 16 | INC_PR = "r8" |
17 | 17 | ||
18 | require uclibc-config.inc | 18 | require uclibc-config.inc |
19 | STAGINGCC = "gcc-cross-intermediate" | ||
20 | STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate" | ||
21 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" | ||
22 | 19 | ||
20 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" | ||
23 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | 21 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" |
24 | 22 | ||
25 | # siteconfig.bbclass runs configure which needs a working compiler | 23 | # siteconfig.bbclass runs configure which needs a working compiler |
@@ -40,63 +38,8 @@ sed -i -e 's# ${base_libdir}# ${SYSROOT_DESTDIR}${base_libdir}#g' -e 's# ${libdi | |||
40 | # is a uclibc build. | 38 | # is a uclibc build. |
41 | COMPATIBLE_HOST = ".*-uclibc.*" | 39 | COMPATIBLE_HOST = ".*-uclibc.*" |
42 | 40 | ||
43 | PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" | ||
44 | DEPENDS = "virtual/${TARGET_PREFIX}binutils \ | ||
45 | virtual/${TARGET_PREFIX}gcc-intermediate \ | ||
46 | linux-libc-headers ncurses-native" | ||
47 | RDEPENDS_${PN}-dev = "linux-libc-headers-dev" | ||
48 | |||
49 | INHIBIT_DEFAULT_DEPS = "1" | 41 | INHIBIT_DEFAULT_DEPS = "1" |
50 | 42 | ||
51 | # Ensure the uclibc-dev package is processed before uclibc-staticdev to allow | ||
52 | # *_nonshared.a libraries to be packaged in the uclibc-dev package. | ||
53 | PACKAGES = "ldd uclibc-utils-dbg uclibc-utils uclibc-gconv uclibc-thread-db uclibc-argp uclibc-backtrace uclibc-libcrypt uclibc-libintl uclibc-libnsl uclibc-libresolv uclibc-libm uclibc-libdl uclibc-libutil uclibc-libpthread uclibc-librt ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" | ||
54 | |||
55 | FILES_uclibc-libcrypt = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so" | ||
56 | FILES_uclibc-libintl = "${base_libdir}/libintl*.so.* ${base_libdir}/libintl-*.so" | ||
57 | FILES_uclibc-libnsl = "${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so" | ||
58 | FILES_uclibc-libresolv = "${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so" | ||
59 | FILES_uclibc-libm = "${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so" | ||
60 | FILES_uclibc-libdl = "${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so" | ||
61 | FILES_uclibc-libutil = "${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so" | ||
62 | FILES_uclibc-libpthread = "${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so" | ||
63 | FILES_uclibc-librt = "${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so" | ||
64 | |||
65 | FILES_ldd = "${bindir}/ldd" | ||
66 | FILES_uclibc-utils = "${bindir} ${sbindir}" | ||
67 | FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug" | ||
68 | FILES_uclibc-gconv = "${libdir}/gconv" | ||
69 | FILES_uclibc-thread-db = "${base_libdir}/libthread_db*" | ||
70 | FILES_uclibc-argp = "${base_libdir}/libuargp-*.so ${base_libdir}/libuargp*.so.*" | ||
71 | FILES_uclibc-backtrace = "${base_libdir}/libubacktrace-*.so ${base_libdir}/libubacktrace*.so.*" | ||
72 | |||
73 | # The last line (gdb and lib1) is for uclinux-uclibc builds | ||
74 | uclibc_baselibs = "${base_libdir}/ld*.so.* ${base_libdir}/ld*.so \ | ||
75 | ${base_libdir}/libc*.so.* ${base_libdir}/libuClibc-*.so \ | ||
76 | ${libdir}/libc.gdb ${libdir}/libc ${base_libdir}/lib1.so \ | ||
77 | " | ||
78 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" | ||
79 | FILES_${PN}-dev += "\ | ||
80 | ${libdir}/lib*.so \ | ||
81 | ${libdir}/*_nonshared.a \ | ||
82 | ${libdir}/[S]*crt[1in].o \ | ||
83 | ${libdir}/crtreloc*.o \ | ||
84 | ${includedir}/*.h ${includedir}/*/*.h \ | ||
85 | " | ||
86 | FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \ | ||
87 | ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale" | ||
88 | |||
89 | RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" | ||
90 | # uclibc does not really have libsegfault but then using the one from glibc is also not | ||
91 | # going to work. So we pretend that we have it to make bitbake not pull other recipes | ||
92 | # to satisfy this dependency for the images/tasks | ||
93 | |||
94 | RPROVIDES_${PN} += "libsegfault rtld(GNU_HASH)" | ||
95 | |||
96 | SRC_URI = "\ | ||
97 | http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2;name=uClibc-${PV} \ | ||
98 | " | ||
99 | |||
100 | # do_stage barfs on a CC with whitespace, therefore put the 'HOST_CC_ARCH' in | 43 | # do_stage barfs on a CC with whitespace, therefore put the 'HOST_CC_ARCH' in |
101 | # the CFLAGS (when building the utils). | 44 | # the CFLAGS (when building the utils). |
102 | OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}'" | 45 | OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}'" |