From f56a544c49284c258c5c46520752b7be0c0f2379 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 24 Nov 2009 12:09:52 +0100 Subject: uclibc: clean up uClibc for the new oe features mainly done Richard Purdie * fix paralllel make install of uClibc, now we have libc.so in place * bump PR for 0.9.30.1 --- recipes/uclibc/uclibc-0.9.30.1/installfix.patch | 33 ++++++++++++++ recipes/uclibc/uclibc-initial_0.9.30.1.bb | 23 ++++------ recipes/uclibc/uclibc.inc | 59 ++++--------------------- recipes/uclibc/uclibc_0.9.30.1.bb | 3 +- 4 files changed, 53 insertions(+), 65 deletions(-) create mode 100644 recipes/uclibc/uclibc-0.9.30.1/installfix.patch (limited to 'recipes/uclibc') diff --git a/recipes/uclibc/uclibc-0.9.30.1/installfix.patch b/recipes/uclibc/uclibc-0.9.30.1/installfix.patch new file mode 100644 index 0000000000..eab964de13 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.1/installfix.patch @@ -0,0 +1,33 @@ +Index: uClibc-0.9.30.1/Makefile.in +=================================================================== +--- uClibc-0.9.30.1.orig/Makefile.in 2009-11-20 22:51:12.544261346 +0100 ++++ uClibc-0.9.30.1/Makefile.in 2009-11-20 22:52:59.980922849 +0100 +@@ -369,7 +369,7 @@ + endif + + # Installs development library links. +-install_dev: install_headers all ++install_dev: install_headers install_runtime + $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib + -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ + ifeq ($(HAVE_SHARED),y) +Index: uClibc-0.9.30.1/utils/Makefile.in +=================================================================== +--- uClibc-0.9.30.1.orig/utils/Makefile.in 2009-11-20 22:54:00.352165960 +0100 ++++ uClibc-0.9.30.1/utils/Makefile.in 2009-11-20 22:54:47.754245713 +0100 +@@ -89,12 +89,12 @@ + utils_install: utils + #$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/readelf $(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf + ifeq ($(HAVE_SHARED),y) +- $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd $(PREFIX)$(RUNTIME_PREFIX)usr/bin/ldd ++ $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd $(PREFIX)$(RUNTIME_PREFIX)bin/ldd + $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig + endif + ifeq ($(UCLIBC_HAS_LOCALE),y) +- $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv $(PREFIX)$(RUNTIME_PREFIX)usr/bin/iconv +- $(Q)$(INSTALL) -m 755 $(utils_OUT)/locale $(PREFIX)$(RUNTIME_PREFIX)usr/bin/locale ++ $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv $(PREFIX)$(RUNTIME_PREFIX)bin/iconv ++ $(Q)$(INSTALL) -m 755 $(utils_OUT)/locale $(PREFIX)$(RUNTIME_PREFIX)bin/locale + endif + + objclean-y += utils_clean diff --git a/recipes/uclibc/uclibc-initial_0.9.30.1.bb b/recipes/uclibc/uclibc-initial_0.9.30.1.bb index 46c0f66697..d0491fcc67 100644 --- a/recipes/uclibc/uclibc-initial_0.9.30.1.bb +++ b/recipes/uclibc/uclibc-initial_0.9.30.1.bb @@ -5,27 +5,22 @@ DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" -do_stage() { +do_install() { # Install initial headers into the cross dir - make V=1 CC="${CC}" PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ install_headers - ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include + #ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include # This conflicts with the c++ version of this header - rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h - install -d ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 lib/libc.so ${UCLIBC_STAGE_PREFIX}/lib -} - -do_install() { - : + rm -f ${D}${includedir}/bits/atomicity.h + install -d ${D}${libdir}/ + install -m 644 lib/crt[1in].o ${D}${libdir}/ + install -d ${D}${libdir}/ + install -m 644 lib/libc.so ${D}${libdir}/ } do_compile () { - make V=1 CC="${CC}" PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ lib/crt1.o lib/crti.o lib/crtn.o ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ -o lib/libc.so diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc index 88f62fa557..903aea27b9 100644 --- a/recipes/uclibc/uclibc.inc +++ b/recipes/uclibc/uclibc.inc @@ -73,7 +73,6 @@ SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'y file://uClibc.config \ http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \ " -UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}" # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in # the CFLAGS (for when building the utils). @@ -92,6 +91,9 @@ KERNEL_HEADERS = "${STAGING_INCDIR}" # ARCH_WANTS_BIG_ENDIAN=y # ARCH_WANTS_LITTLE_ENDIAN is not set +# How to enable verbose logs: +#export VERBOSE="1" + configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${KERNEL_SOURCE}",g; \ s,^KERNEL_HEADERS=.*,KERNEL_HEADERS="${KERNEL_HEADERS}",g; \ s,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX="/",g; \ @@ -156,69 +158,26 @@ do_configure() { yes '' | oe_runmake oldconfig } -do_stage() { - # This MUST be done first because we - # will install crt1.o in the install_dev stage and gcc needs it - - # Install into the staging dir - oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - install_dev install_runtime - - # We don't really need this - rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore - - # Fixup shared lib symlinks - ( cd ${UCLIBC_STAGE_PREFIX}/lib - for f in c crypt dl m nsl pthread resolv thread_db util; do - ln -sf lib${f}.so.? lib${f}.so - done - ) - - # This conflicts with the c++ version of this header - rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h -} - do_install() { - # Tis MUST be done first because we - # will install crt1.o in the install_dev stage and gcc needs it) - oe_runmake STRIPTOOL=true PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - install_dev install_runtime - - oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ + oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ install_dev install_runtime + # Need to overwrite the version from -initial + #if [ ! -e ${D}${libdir}/libc.so ]; then + # ln -s ../../lib/libc.so.0 ${D}${libdir}/libc.so + #fi + # We don't really need this in ${includedir} rm -f ${D}${prefix}/include/.cvsignore # This conflicts with the c++ version of this header rm -f ${D}${prefix}/include/bits/atomicity.h - # ugh.. uclibc doesn't like obeying our path variables. - if [ "${includedir}" != "${prefix}/include" ]; then - install -d ${D}${includedir} - mv ${D}${prefix}/include/* ${D}${includedir}/ - rmdir ${D}${prefix}/include - fi - - if [ "${libdir}" != "${prefix}/lib" ]; then - install -d ${D}${libdir} - mv ${D}${prefix}/lib/* ${D}${libdir}/ - rmdir ${D}${prefix}/lib - fi - oe_runmake "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" utils oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ install_utils # oe_runstrip needs +x on files chmod +x ${D}/${base_libdir}/* - - if [ "${bindir}" != "/usr/bin" ]; then - install -d ${D}${bindir} - mv ${D}/usr/bin/* ${D}${bindir}/ - rmdir ${D}/usr/bin - fi } diff --git a/recipes/uclibc/uclibc_0.9.30.1.bb b/recipes/uclibc/uclibc_0.9.30.1.bb index 1f8162edfc..c32b2f1d82 100644 --- a/recipes/uclibc/uclibc_0.9.30.1.bb +++ b/recipes/uclibc/uclibc_0.9.30.1.bb @@ -9,7 +9,7 @@ UCLIBC_BASE ?= "0.9.30.1" require uclibc.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.3" PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" @@ -22,6 +22,7 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \ file://gcc-4.4-fixlet.patch;patch=1 \ file://uclibc-c99-ldbl-math.patch;patch=1 \ file://Use-__always_inline-instead-of-__inline__.patch;patch=1 \ + file://installfix.patch;patch=1 \ " #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3