gcc-cross-sdk: Move common data into sdk .inc files. Add gcc-cross-sdk-3.4.3.

diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index e298b1c..deb92c9 100644 (file)
--- a/packages/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb
@@ -2,116 +2,15 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r2"
 include gcc_${PV}.bb
+PR = "r3"
 
-# Files for these are defined in the main gcc.oe
-#PACKAGES = "libgcc libstdc++ libg2c"
-
-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 \
-          file://bash3.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}"
+inherit sdk
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PACKAGES = "${PN}"
 
-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
-#}
-
-python do_package() {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-                bb.data.setVar('PKG_libgcc', 'libgcc1', d)
-        bb.build.exec_func('package_do_package', d)
-}
-
-do_install () {
-        oe_runmake 'DESTDIR=${D}' install
-
-        # Move libgcc_s into /lib
-        mkdir -p ${D}${base_libdir}
-        if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then
-                # native builds drop one pathname component
-                mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
-        else
-                mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
-        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}${base_libdir}/libgcc_s.so.*
-        fi
-}
\ No newline at end of file
+include gcc3-build-sdk.inc
+include gcc-package-sdk.inc

diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb
new file mode 100644 (file)
index 0000000..2056063
--- /dev/null
+++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+include gcc_${PV}.bb
+PR = "r0"
+
+inherit sdk
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PACKAGES = "${PN}"
+
+include gcc3-build-sdk.inc
+include gcc-package-sdk.inc

diff --git a/packages/gcc/gcc-package-sdk.inc b/packages/gcc/gcc-package-sdk.inc
new file mode 100644 (file)
index 0000000..9d44fb5
--- /dev/null
+++ b/packages/gcc/gcc-package-sdk.inc
@@ -0,0 +1,47 @@
+# Packages emitted by our gcc-cross builds.
+#
+INHIBIT_PACKAGE_STRIP ?= ""
+HAS_G2C ?= "yes"
+HAS_GFORTRAN ?= "no"
+OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
+INHIBIT_PACKAGE_STRIP = "1"
+
+
+python do_package() {
+       if bb.data.getVar('DEBIAN_NAMES', d, 1):
+               bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+       bb.build.exec_func('package_do_package', d)
+}
+
+do_install () {
+       oe_runmake 'DESTDIR=${D}' install
+
+       # Move libgcc_s into /lib
+       mkdir -p ${D}${base_libdir}
+       if [ -f ${D}${base_libdir}/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}${base_libdir}
+       else
+               mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
+       fi
+
+       # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
+       mkdir -p ${D}${libdir}
+       mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${libdir}
+       if [ "${HAS_G2C}" = "yes" ]; then
+         mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${libdir}
+       fi
+       if [ "${HAS_GFORTRAN}" = "yes" ]; then
+         mv -f ${D}${prefix}/*/lib/libgfortran*.so.* ${D}${libdir}
+       fi
+
+       # 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}${libdir}/libstdc++.so.*
+               ${TARGET_PREFIX}strip ${D}${libdir}/libg2c.so.*
+               ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.*
+       fi
+}

diff --git a/packages/gcc/gcc3-build-sdk.inc b/packages/gcc/gcc3-build-sdk.inc
new file mode 100644 (file)
index 0000000..e2ec956
--- /dev/null
+++ b/packages/gcc/gcc3-build-sdk.inc
@@ -0,0 +1,27 @@
+USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
+
+SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
+
+STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include"
+STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
+
+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 ${TARGET_CC_ARCH}"
+       oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}"
+}