Remove glibc and binutils cvs versions
authorRichard Purdie <richard@openedhand.com>
Tue, 9 May 2006 17:42:08 +0000 (17:42 +0000)
committerRichard Purdie <richard@openedhand.com>
Tue, 9 May 2006 17:42:08 +0000 (17:42 +0000)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@383 311d38ba-8fff-0310-9ca6-ca027cbcb966

openembedded/packages/binutils/binutils-cross_cvs.bb [deleted file]
openembedded/packages/binutils/binutils_cvs.bb [deleted file]
openembedded/packages/glibc/glibc-initial_cvs.bb [deleted file]
openembedded/packages/glibc/glibc-intermediate_cvs.bb [deleted file]
openembedded/packages/glibc/glibc_cvs.bb [deleted file]

diff --git a/openembedded/packages/binutils/binutils-cross_cvs.bb b/openembedded/packages/binutils/binutils-cross_cvs.bb
deleted file mode 100644 (file)
index 0e338b5..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-SECTION = "devel"
-include binutils_cvs.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
-               --program-prefix=${TARGET_PREFIX}"
-
-do_stage () {
-       oe_runmake install
-
-       # We don't really need these, so we'll remove them...
-       rm -rf ${CROSS_DIR}/lib/ldscripts
-       rm -rf ${CROSS_DIR}/share/info
-       rm -rf ${CROSS_DIR}/share/locale
-       rm -rf ${CROSS_DIR}/share/man
-       rmdir ${CROSS_DIR}/share || :
-       rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
-       rmdir ${CROSS_DIR}/${libdir} || :
-       rmdir ${CROSS_DIR}/${prefix} || :
-
-       # We want to move this into the target specific location
-       mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
-       mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
-       rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
-       :
-}
diff --git a/openembedded/packages/binutils/binutils_cvs.bb b/openembedded/packages/binutils/binutils_cvs.bb
deleted file mode 100644 (file)
index e870c8f..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-SECTION = "devel"
-inherit autotools gettext
-
-DESCRIPTION = "A GNU collection of binary utilities"
-HOMEPAGE = "http://www.gnu.org/software/binutils/"
-LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
-PV = "0.0+cvs${SRCDATE}"
-PR = "r2"
-
-PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
-
-FILES_${PN} = " \
-       ${bindir}/${TARGET_PREFIX}* \
-       ${libdir}/lib*-*.so \
-       ${prefix}/${TARGET_SYS}/bin/*"
-
-FILES_${PN}-dev = " \
-       ${includedir} \
-       ${libdir}/*.a \
-       ${libdir}/*.la \
-       ${libdir}/libbfd.so \
-       ${libdir}/libopcodes.so"
-
-FILES_${PN}-symlinks = " \
-       ${bindir}/addr2line \
-       ${bindir}/ar \
-       ${bindir}/as \
-       ${bindir}/c++filt \
-       ${bindir}/gprof \
-       ${bindir}/ld \
-       ${bindir}/nm \
-       ${bindir}/objcopy \
-       ${bindir}/objdump \
-       ${bindir}/ranlib \
-       ${bindir}/readelf \
-       ${bindir}/size \
-       ${bindir}/strings \
-       ${bindir}/strip"
-
-SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;method=pserver;localdir=src \
-     file://ld_makefile.patch;patch=1 \
-     file://better_file_error.patch;patch=1 \
-     file://signed_char_fix.patch;patch=1 \
-     file://binutils-100_cflags_for_build.patch;patch=1 \
-     file://binutils-2.15.91.0.1-uclibc-100-conf.patch;patch=1 \
-     file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1"
-
-S = "${WORKDIR}/src"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-EXTRA_OECONF = "--with-sysroot=${prefix} \
-               --program-prefix=${TARGET_PREFIX} \
-               --enable-shared"
-
-# This is necessary due to a bug in the binutils Makefiles
-EXTRA_OEMAKE = "configure-build-libiberty all"
-
-export AR = "${HOST_PREFIX}ar"
-export AS = "${HOST_PREFIX}as"
-export LD = "${HOST_PREFIX}ld"
-export NM = "${HOST_PREFIX}nm"
-export RANLIB = "${HOST_PREFIX}ranlib"
-export OBJCOPY = "${HOST_PREFIX}objcopy"
-export OBJDUMP = "${HOST_PREFIX}objdump"
-
-export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
-export AS_FOR_TARGET = "${TARGET_PREFIX}as"
-export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
-export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
-export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
-
-export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
-export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
-
-export CC_FOR_BUILD = "${BUILD_CC}"
-
-export CC = "${CCACHE} ${HOST_PREFIX}gcc"
-
-do_configure () {
-       (cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
-       oe_runconf
-}
-
-do_stage () {
-       oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
-       oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
-       oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
-       install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
-       install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
-       install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
-       install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
-       install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
-       install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
-}
-
-do_install () {
-       autotools_do_install
-
-       # We don't really need these, so we'll remove them...
-       rm -rf ${D}${libdir}/ldscripts
-
-       # Fix the /usr/${TARGET_SYS}/bin/* links
-       for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
-               rm -f $l
-               ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
-                       | tr -s / \
-                       | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
-       done
-
-       # Install the libiberty header
-       install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
-       install -m 644 ${S}/include/libiberty.h ${D}${includedir}
-
-       cd ${D}${bindir}
-
-       # Symlinks for ease of running these on the native target
-       for p in ${TARGET_SYS}-* ; do
-               ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
-       done
-}
diff --git a/openembedded/packages/glibc/glibc-initial_cvs.bb b/openembedded/packages/glibc/glibc-initial_cvs.bb
deleted file mode 100644 (file)
index 422e8b7..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-SECTION = "libs"
-include glibc_${PV}.bb
-
-DEPENDS = "linux-libc-headers"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = ""
-
-do_configure () {
-       sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
-       chmod +x ${S}/configure
-       CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
-               --without-cvs --disable-sanity-checks \
-               --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
-               --enable-hacker-mode
-       if grep -q GLIBC_2.3 ${S}/ChangeLog; then
-               # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-               # Fortunately, we don't need errlist-compat.c, since we just need .h files, 
-               # so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
-               # Another workaround might be to tell configure to not use any cross options to $(CC).
-               # The real fix would be to get install-headers to not generate errlist-compat.c.
-               make sysdeps/gnu/errlist.c
-               mkdir -p stdio-common
-               touch stdio-common/errlist-compat.c
-       fi
-}
-
-do_compile () {
-       :
-}
-
-do_stage () {
-       oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
-
-       # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
-       # so do them by hand.  We can tolerate an empty stubs.h for the moment.
-       # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-       mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-       touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-       cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
-}
-
-do_install () {
-       :
-}
diff --git a/openembedded/packages/glibc/glibc-intermediate_cvs.bb b/openembedded/packages/glibc/glibc-intermediate_cvs.bb
deleted file mode 100644 (file)
index 11e78a5..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "libs"
-include glibc_${PV}.bb
-
-DEFAULT_PREFERENCE = "-1"
-
-do_install () {
-       :
-}
-
-PACKAGES = ""
-PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
-GLIBC_ADDONS = "linuxthreads"
-GLIBC_EXTRA_OECONF = ""
diff --git a/openembedded/packages/glibc/glibc_cvs.bb b/openembedded/packages/glibc/glibc_cvs.bb
deleted file mode 100644 (file)
index 0390b87..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
-PR = "r0"
-PV = "2.3.5+cvs${SRCDATE}"
-
-GLIBC_ADDONS ?= "ports,linuxthreads"
-GLIBC_EXTRA_OECONF ?= ""
-
-DEFAULT_PREFERENCE = "-1"
-
-#
-# For now, we will skip building of a gcc package if it is a uclibc one
-# and our build is not a uclibc one, and we skip a glibc one if our build
-# is a uclibc build.
-#
-# See the note in gcc/gcc_3.4.0.oe
-#
-
-python __anonymous () {
-    import bb, re
-    uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
-    if uc_os:
-        raise bb.parse.SkipPackage("incompatible with target %s" %
-                                   bb.data.getVar('TARGET_OS', d, 1))
-}
-
-# nptl needs unwind support in gcc, which can't be built without glibc.
-PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
-PROVIDES += "virtual/libintl virtual/libiconv"
-DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
-INHIBIT_DEFAULT_DEPS = "1"
-RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
-
-#         file://noinfo.patch;patch=1
-#         file://ldconfig.patch;patch=1;pnum=0
-#         file://arm-no-hwcap.patch;patch=1;pnum=0 \
-#         file://arm-memcpy.patch;patch=1;pnum=0 \
-#         file://arm-machine-gmon.patch;patch=1;pnum=0 \
-#         \
-#         file://arm-ioperm.patch;patch=1;pnum=0 \
-#         file://ldd.patch;patch=1;pnum=0 \
-SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \
-          cvs://anoncvs@sources.redhat.com/cvs/glibc;module=ports \
-          file://arm-audit.patch;patch=1 \
-          file://arm-audit2.patch;patch=1 \
-          file://arm-memcpy.patch;patch=1 \
-          file://arm-longlong.patch;patch=1;pnum=0 \
-          file://fhs-linux-paths.patch;patch=1 \
-          file://dl-cache-libcmp.patch;patch=1 \
-          file://ldsocache-varrun.patch;patch=1 \
-           file://etc/ld.so.conf \
-          file://generate-supported.mk"
-
-# seems to fail on tls platforms
-SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
-
-S = "${WORKDIR}/libc"
-B = "${WORKDIR}/build-${TARGET_SYS}"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
-               --without-cvs --disable-profile --disable-debug --without-gd \
-               --enable-clocale=gnu \
-               --enable-add-ons=${GLIBC_ADDONS} \
-               --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
-               --without-selinux \
-               ${GLIBC_EXTRA_OECONF}"
-
-EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
-
-def get_glibc_fpu_setting(bb, d):
-       if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-               return "--without-fp"
-       return ""
-
-do_munge() {
-       # Integrate ports into tree
-       mv ${WORKDIR}/ports ${S}
-}
-
-addtask munge before do_patch after do_unpack
-
-do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
-# version check and doesn't really help with anything
-       if [ -z "`which rpcgen`" ]; then
-               echo "rpcgen not found.  Install glibc-devel."
-               exit 1
-       fi
-       (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
-       CPPFLAGS="" oe_runconf
-}
-
-rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
-         yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
-         rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
-
-do_compile () {
-       # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
-       unset LDFLAGS
-       base_do_compile
-       (
-               cd ${S}/sunrpc/rpcsvc
-               for r in ${rpcsvc}; do
-                       h=`echo $r|sed -e's,\.x$,.h,'`
-                       rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
-               done
-       )
-}
-
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
-       done
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-       rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-       oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                  ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-       install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-       done
-
-       for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-       done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
-}
-
-include glibc-package.bbclass