From d097b90ed729456b685e457c99ac9c64f96e214c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 9 May 2006 17:42:08 +0000
Subject: Remove glibc and binutils cvs versions

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@383 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/packages/glibc/glibc-initial_cvs.bb   |  46 ------
 .../packages/glibc/glibc-intermediate_cvs.bb       |  14 --
 openembedded/packages/glibc/glibc_cvs.bb           | 167 ---------------------
 3 files changed, 227 deletions(-)
 delete mode 100644 openembedded/packages/glibc/glibc-initial_cvs.bb
 delete mode 100644 openembedded/packages/glibc/glibc-intermediate_cvs.bb
 delete mode 100644 openembedded/packages/glibc/glibc_cvs.bb

(limited to 'openembedded/packages/glibc')

diff --git a/openembedded/packages/glibc/glibc-initial_cvs.bb b/openembedded/packages/glibc/glibc-initial_cvs.bb
deleted file mode 100644
index 422e8b7110..0000000000
--- a/openembedded/packages/glibc/glibc-initial_cvs.bb
+++ /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
index 11e78a5d59..0000000000
--- a/openembedded/packages/glibc/glibc-intermediate_cvs.bb
+++ /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
index 0390b87535..0000000000
--- a/openembedded/packages/glibc/glibc_cvs.bb
+++ /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
-- 
cgit v1.2.3