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

17 files changed, 285 insertions, 5 deletions

diff --git a/gcc/gcc-cross-initial_3.3.3.oe b/gcc/gcc-cross-initial_3.3.3.oe
index 015de3a368..1acadc283a 100644
--- a/gcc/gcc-cross-initial_3.3.3.oe
+++ b/gcc/gcc-cross-initial_3.3.3.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 include gcc-cross_${PV}.oe
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
diff --git a/gcc/gcc-cross-initial_3.3.4.oe b/gcc/gcc-cross-initial_3.3.4.oe
index 015de3a368..1acadc283a 100644
--- a/gcc/gcc-cross-initial_3.3.4.oe
+++ b/gcc/gcc-cross-initial_3.3.4.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 include gcc-cross_${PV}.oe
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
diff --git a/gcc/gcc-cross-initial_3.4.1.oe b/gcc/gcc-cross-initial_3.4.1.oe
index f1c7569421..e30a39a840 100644
--- a/gcc/gcc-cross-initial_3.4.1.oe
+++ b/gcc/gcc-cross-initial_3.4.1.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 include gcc-cross_${PV}.oe
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
@@ -28,4 +29,3 @@ do_stage_prepend () {
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 }
-
diff --git a/gcc/gcc-cross-initial_3.4.2.oe b/gcc/gcc-cross-initial_3.4.2.oe
index f1c7569421..e30a39a840 100644
--- a/gcc/gcc-cross-initial_3.4.2.oe
+++ b/gcc/gcc-cross-initial_3.4.2.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 include gcc-cross_${PV}.oe
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
@@ -28,4 +29,3 @@ do_stage_prepend () {
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 }
-
diff --git a/gcc/gcc-cross-kernel_3.3.3.oe b/gcc/gcc-cross-kernel_3.3.3.oe
index 42403cfe43..bc9a53ff38 100644
--- a/gcc/gcc-cross-kernel_3.3.3.oe
+++ b/gcc/gcc-cross-kernel_3.3.3.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 # cut-down gcc for kernel builds
 # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 
diff --git a/gcc/gcc-cross-kernel_3.3.4.oe b/gcc/gcc-cross-kernel_3.3.4.oe
index e69de29bb2..bc9a53ff38 100644
--- a/gcc/gcc-cross-kernel_3.3.4.oe
+++ b/gcc/gcc-cross-kernel_3.3.4.oe
@@ -0,0 +1,17 @@
+SECTION = "devel"
+# cut-down gcc for kernel builds
+# only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
+
+include gcc-cross-initial_${PV}.oe
+
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
+
+do_install () {
+	:
+}
+
+do_stage () {
+	cd gcc
+	oe_runmake install-common install-headers install-libgcc
+	install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
+}
diff --git a/gcc/gcc-cross-sdk_3.3.4.oe b/gcc/gcc-cross-sdk_3.3.4.oe
index e69de29bb2..fe95252653 100644
--- a/gcc/gcc-cross-sdk_3.3.4.oe
+++ b/gcc/gcc-cross-sdk_3.3.4.oe
@@ -0,0 +1,77 @@
+SECTION = "devel"
+DESCRIPTION = "The GNU cc and gcc C compilers."
+LICENSE = "GPL"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+inherit autotools sdk
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	   file://arm-gotoff.dpatch;patch=1;pnum=0 \
+	   file://arm-ldm.dpatch;patch=1;pnum=0 \
+	   file://arm-tune.patch;patch=1;pnum=0 \
+	   file://arm-ldm-peephole.patch;patch=1;pnum=0 \
+	   file://libibery-crosstool.patch;patch=1;pnum=1 \
+	   file://reverse-compare.patch;patch=1 \
+	   file://gcc34-15089.patch;patch=1 \
+	   file://gcc-uclibc-3.3-100-conf.patch;patch=1 \
+	   file://gcc-uclibc-3.3-110-conf.patch;patch=1 \
+	   file://gcc-uclibc-3.3-120-softfloat.patch;patch=1 \
+	   file://gcc-uclibc-3.3-200-code.patch;patch=1"
+
+SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
+
+MIRRORS_prepend () {
+${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/
+}
+
+S = "${WORKDIR}/gcc-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+
+export CPPFLAGS = ""
+export CXXFLAGS = ""
+export CFLAGS = ""
+export LDFLAGS = ""
+
+STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include"
+STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
+
+EXTRA_OECONF = "--with-gnu-ld \
+                --enable-shared \
+                --enable-languages=c,c++,f77 \
+                --enable-threads=posix \
+                --enable-multilib \
+                --enable-c99 \
+                --enable-long-long \
+                --enable-symvers=gnu \
+                --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_PATHS} \
+                ${EXTRA_OECONF_DEP}"
+
+do_configure () {
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	(cd ${S}/libstdc++-v3 && autoreconf)
+	oe_runconf
+	mkdir -p gcc
+	ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}as gcc/as
+	ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}ld gcc/ld
+	ln -sf ${STAGING_TARGET_INCDIR}/* ${S}/include
+	ln -sf ${STAGING_TARGET_LIBDIR}/crt*.o gcc/
+}
+
+do_compile () {
+	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"
+	oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}" 
+}
+
+do_install () {
+	autotools_do_install
+}
diff --git a/gcc/gcc-cross-sdk_3.4.1.oe b/gcc/gcc-cross-sdk_3.4.1.oe
index b9ee001406..2516ecfaca 100644
--- a/gcc/gcc-cross-sdk_3.4.1.oe
+++ b/gcc/gcc-cross-sdk_3.4.1.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 LICENSE = "GPL"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
diff --git a/gcc/gcc-cross-sdk_3.4.2.oe b/gcc/gcc-cross-sdk_3.4.2.oe
index e69de29bb2..2516ecfaca 100644
--- a/gcc/gcc-cross-sdk_3.4.2.oe
+++ b/gcc/gcc-cross-sdk_3.4.2.oe
@@ -0,0 +1,82 @@
+SECTION = "devel"
+DESCRIPTION = "The GNU cc and gcc C compilers."
+LICENSE = "GPL"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+inherit autotools sdk
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	   file://gcc34-reverse-compare.patch;patch=1 \
+	   file://gcc34-arm-ldm.patch;patch=1 \
+	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
+	   file://gcc34-arm-tune.patch;patch=1 \
+	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
+	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
+	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
+	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1"
+
+SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
+
+MIRRORS_prepend () {
+${GNU_MIRROR}/gcc/	http://gcc.get-software.com/releases/
+${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/
+}
+
+S = "${WORKDIR}/gcc-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+
+export CPPFLAGS = ""
+export CXXFLAGS = ""
+export CFLAGS = ""
+export LDFLAGS = ""
+
+STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include"
+STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
+
+EXTRA_OECONF = "--with-gnu-ld \
+                --enable-shared \
+                --enable-languages=c,c++,f77 \
+                --enable-threads=posix \
+                --enable-multilib \
+                --enable-c99 \
+                --enable-long-long \
+                --enable-symvers=gnu \
+                --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_PATHS} \
+                ${EXTRA_OECONF_DEP}"
+
+EXTRA_OECONF += "${@get_gcc_fpu_setting(oe, d)}"
+
+def get_gcc_fpu_setting(oe, d):
+	if oe.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		return "--with-float=soft"
+	return ""
+
+do_configure () {
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	(cd ${S}/libstdc++-v3 && autoreconf)
+	oe_runconf
+	mkdir -p gcc
+	ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}as gcc/as
+	ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}ld gcc/ld
+	ln -sf ${STAGING_TARGET_INCDIR}/* ${S}/include
+	ln -sf ${STAGING_TARGET_LIBDIR}/crt*.o gcc/
+}
+
+do_compile () {
+	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"
+	oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}" 
+}
+
+do_install () {
+	autotools_do_install
+}
diff --git a/gcc/gcc-cross_3.3.3.oe b/gcc/gcc-cross_3.3.3.oe
index 8271745097..3c8869c4fd 100644
--- a/gcc/gcc-cross_3.3.3.oe
+++ b/gcc/gcc-cross_3.3.3.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 include gcc_${PV}.oe
 inherit cross
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
diff --git a/gcc/gcc-cross_3.3.4.oe b/gcc/gcc-cross_3.3.4.oe
index 427da7ccf1..2b00e74730 100644
--- a/gcc/gcc-cross_3.3.4.oe
+++ b/gcc/gcc-cross_3.3.4.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 include gcc_${PV}.oe
 inherit cross
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
diff --git a/gcc/gcc-cross_3.4.1.oe b/gcc/gcc-cross_3.4.1.oe
index b644eb0f86..8c02b9ddb9 100644
--- a/gcc/gcc-cross_3.4.1.oe
+++ b/gcc/gcc-cross_3.4.1.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 include gcc_${PV}.oe
 inherit cross
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
@@ -93,4 +94,3 @@ do_install () {
 		${TARGET_PREFIX}strip ${D}/lib/libgcc_s.so.*
 	fi
 }
-
diff --git a/gcc/gcc-cross_3.4.2.oe b/gcc/gcc-cross_3.4.2.oe
index e69de29bb2..8c02b9ddb9 100644
--- a/gcc/gcc-cross_3.4.2.oe
+++ b/gcc/gcc-cross_3.4.2.oe
@@ -0,0 +1,96 @@
+SECTION = "devel"
+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"
+OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
+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.
+	if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
+		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
+		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
+		${TARGET_PREFIX}strip ${D}/lib/libgcc_s.so.*
+	fi
+}
diff --git a/gcc/gcc_3.3.3.oe b/gcc/gcc_3.3.3.oe
index 03bc34ff05..9dfa1a8089 100644
--- a/gcc/gcc_3.3.3.oe
+++ b/gcc/gcc_3.3.3.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 inherit autotools
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
diff --git a/gcc/gcc_3.3.4.oe b/gcc/gcc_3.3.4.oe
index ebeb6603cd..b413628bcc 100644
--- a/gcc/gcc_3.3.4.oe
+++ b/gcc/gcc_3.3.4.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 inherit autotools
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
diff --git a/gcc/gcc_3.4.0.oe b/gcc/gcc_3.4.0.oe
index 074daeef67..1dbde82100 100644
--- a/gcc/gcc_3.4.0.oe
+++ b/gcc/gcc_3.4.0.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 PR = "r1"
 
 inherit autotools
@@ -185,4 +186,3 @@ do_install () {
 	ln -sf g++ c++
 	ln -sf gcc cc
 }
-
diff --git a/gcc/gcc_3.4.1.oe b/gcc/gcc_3.4.1.oe
index 56fdc651db..6782d98ead 100644
--- a/gcc/gcc_3.4.1.oe
+++ b/gcc/gcc_3.4.1.oe
@@ -1,3 +1,4 @@
+SECTION = "devel"
 PR = "r1"
 
 inherit autotools
@@ -183,4 +184,3 @@ do_install () {
 	ln -sf g++ c++
 	ln -sf gcc cc
 }
-