From bd068236207dee9373f5d559c88325de3446d53b Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 11 Oct 2004 16:36:01 +0000 Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into mhcln01.hentges.local:/home/mhentges/OpenEmbedded/packages 2004/10/11 18:35:17+02:00 local!CoreDump The mother of all section fixes! Gives a SECTION entry to (almost) all packages which were missing it (and thus were having a section of *base*). I have placed all packages unknown to me into the *unknown* section (and yes, i *am* to lazy to look them up), please fix. BKrev: 416ab6716BWMm_ae6D2MValq-LDFzw --- gcc-csl/gcc-csl-cross-initial_2004-q1a.oe | 29 ++++++++++ gcc-csl/gcc-csl-cross_2004-q1a.oe | 93 +++++++++++++++++++++++++++++++ gcc-csl/gcc-csl_2004-q1a.oe | 5 +- 3 files changed, 125 insertions(+), 2 deletions(-) (limited to 'gcc-csl') diff --git a/gcc-csl/gcc-csl-cross-initial_2004-q1a.oe b/gcc-csl/gcc-csl-cross-initial_2004-q1a.oe index e69de29bb2..80695bcd64 100644 --- a/gcc-csl/gcc-csl-cross-initial_2004-q1a.oe +++ b/gcc-csl/gcc-csl-cross-initial_2004-q1a.oe @@ -0,0 +1,29 @@ +SECTION = "devel" +include gcc-csl-cross_${PV}.oe + +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-initial" +PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" + +PACKAGES = "" + +# This is intended to be a -very- basic config +EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ + --with-newlib \ + --disable-nls \ + --disable-shared \ + --disable-threads \ + --disable-multilib \ + --disable-__cxa_atexit \ + --enable-languages=c \ + --enable-target-optspace \ + --program-prefix=${TARGET_PREFIX}" + +do_stage_prepend () { + mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${PV} + ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/3.4.0/libgcc_eh.a +} + +# Override the method from gcc-cross so we don't try to install libgcc +do_install () { + oe_runmake 'DESTDIR=${D}' install +} diff --git a/gcc-csl/gcc-csl-cross_2004-q1a.oe b/gcc-csl/gcc-csl-cross_2004-q1a.oe index e69de29bb2..6ced5d1d2c 100644 --- a/gcc-csl/gcc-csl-cross_2004-q1a.oe +++ b/gcc-csl/gcc-csl-cross_2004-q1a.oe @@ -0,0 +1,93 @@ +SECTION = "devel" +include gcc-csl_${PV}.oe +inherit cross +FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-csl-${PV}" + +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" +PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" + +# Files for these are defined in the main gcc.oe +PACKAGES = "libgcc libstdc++ libg2c" +INHIBIT_PACKAGE_STRIP = "1" + +EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ + --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++" + +export CPPFLAGS = "" +export CXXFLAGS = "" +export CFLAGS = "" +export LDFLAGS = "" + +do_configure () { + rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/3.4.0/libgcc_eh.a + (cd ${S} && gnu-configize) || die "failure running gnu-configize" + oe_runconf +} + +do_compile_prepend () { + export CC="${BUILD_CC}" + export AR_FOR_TARGET="${TARGET_SYS}-ar" + export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib" + export LD_FOR_TARGET="${TARGET_SYS}-ld" + export NM_FOR_TARGET="${TARGET_SYS}-nm" + export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc" +} + +do_stage_append () { + for d in info man share/doc share/locale ; do + rm -rf ${CROSS_DIR}/$d + done + + # These aren't useful on the cross toolchain + rm -f ${CROSS_DIR}/bin/*gcov + rm -f ${CROSS_DIR}/bin/*gccbug + + # Fix a few include links so cross builds are happier + if [ ! -e ${STAGING_INCDIR}/c++ ]; then + mkdir -p ${STAGING_INCDIR} + ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \ + ${STAGING_INCDIR}/ + fi + + # We use libiberty from binutils + rm -f ${CROSS_DIR}/lib/libiberty.a + + # We probably don't need these + rmdir ${CROSS_DIR}/include || : + + # We don't really need to keep this around + rm -rf ${CROSS_DIR}/share +} + +python do_package() { + if oe.data.getVar('DEBIAN_NAMES', d, 1): + oe.data.setVar('PKG_libgcc', 'libgcc1', d) + oe.build.exec_func('package_do_package', d) +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + + # Move libgcc_s into /lib + mkdir -p ${D}/lib + if [ -f ${D}/lib/libgcc_s.so.? ]; then + # Already in the right location + : + elif [ -f ${D}/${prefix}/lib/libgcc_s.so.? ]; then + mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/lib + else + mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/lib + fi + + # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr + TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'` + mkdir -p ${D}/${TGT_LIBDIR} + mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR} + mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR} + + # Manually run the target stripper since we won't get it run by + # the packaging. + ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.* + ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.* + ${TARGET_PREFIX}strip ${D}/libgcc_s.so.* +} diff --git a/gcc-csl/gcc-csl_2004-q1a.oe b/gcc-csl/gcc-csl_2004-q1a.oe index 7f3bb7930a..7c6c83d93d 100644 --- a/gcc-csl/gcc-csl_2004-q1a.oe +++ b/gcc-csl/gcc-csl_2004-q1a.oe @@ -1,3 +1,4 @@ +SECTION = "base" inherit autotools DESCRIPTION = "The GNU cc and gcc C compilers." @@ -123,7 +124,8 @@ gccbuild_uclibc_do_patch () { # # Prevent gcc from using the unwind-dw2-fde-glibc code # - perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc\n#ifndef inhibit_libc,g;" gcc/unwind-dw2-fde-glibc.c + perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc +#ifndef inhibit_libc,g;" gcc/unwind-dw2-fde-glibc.c } python do_patch () { @@ -226,4 +228,3 @@ do_install () { ln -sf g++ c++ ln -sf gcc cc } - -- cgit v1.2.3