Merge openembedded@openembedded.bkbits.net:packages

into handhelds.org:/home/kergoth/code/packages

2004/08/27 18:10:14-05:00 handhelds.org!kergoth
Kill off the -cross versions of gcc 3.4.0 to reduce the amount of maintainance a bit.

BKrev: 412fbf7aDskmMmaynXSBcHrWC7ZsuA

diff --git a/gcc/gcc-cross-initial_3.4.0.oe b/gcc/gcc-cross-initial_3.4.0.oe
deleted file mode 100644 (file)
index 933de58..0000000
--- a/gcc/gcc-cross-initial_3.4.0.oe
+++ /dev/null
@@ -1,31 +0,0 @@
-include gcc-cross_${PV}.oe
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][oe.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'mips', 'mipsel']]}"
-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} \
-               ${@get_gcc_fpu_setting(oe, d)}"
-
-do_stage_prepend () {
-       mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${PV}
-       ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${PV}/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/gcc-cross_3.4.0.oe b/gcc/gcc-cross_3.4.0.oe
deleted file mode 100644 (file)
index 493c666..0000000
--- a/gcc/gcc-cross_3.4.0.oe
+++ /dev/null
@@ -1,93 +0,0 @@
-include gcc_${PV}.oe
-inherit cross
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${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}/${PV}/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}/lib/libgcc_s.so.*
-}
-