[oe-commits] org.oe.dev merge of '0de79e77116c042b92a36942f9817043f9ee16d1'
rwhitby commit
openembedded-commits at lists.openembedded.org
Mon Sep 24 09:18:12 UTC 2007
merge of '0de79e77116c042b92a36942f9817043f9ee16d1'
and 'a8f3bafcb48eddb52c9b4c0eae2518264f20ea14'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: b78f2dc352e2e9c1e3c7c2020293e603d6c2a7b8
ViewMTN: http://monotone.openembedded.org/revision/info/b78f2dc352e2e9c1e3c7c2020293e603d6c2a7b8
Files:
1
packages/meta/slugos-packages.bb
packages/redboot-utils/fis_1.0.bb
packages/gcc/gcc-cross-initial.inc
conf/distro/include/sane-srcrevs.inc
packages/gcc/gcc-cross-initial_3.3.3.bb
packages/gcc/gcc-cross-initial_3.3.4.bb
packages/gcc/gcc-cross-initial_3.4.3.bb
packages/gcc/gcc-cross-initial_3.4.4.bb
packages/gcc/gcc-cross-initial_4.0.2.bb
packages/gcc/gcc-cross-initial_4.1.0.bb
packages/gcc/gcc-cross-initial_4.1.1.bb
packages/gcc/gcc-cross-initial_4.1.2.bb
packages/gcc/gcc-cross-initial_4.2.1.bb
packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
packages/gcc/gcc-cross_4.1.0.bb
packages/gcc/gcc-cross_4.1.1.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc-package-cross.inc
packages/gcc/gcc-package-sdk.inc
packages/gcc/gcc4-build.inc
packages/gcc/gcc_4.0.2.bb
packages/gcc/gcc_4.1.0.bb
packages/gcc/gcc_4.1.1.bb
packages/gcc/gcc_4.1.2.bb
packages/gcc/gcc_4.2.1.bb
packages/gstreamer/gst-plugins.inc
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
Diffs:
#
# mt diff -r0de79e77116c042b92a36942f9817043f9ee16d1 -rb78f2dc352e2e9c1e3c7c2020293e603d6c2a7b8
#
#
#
# patch "packages/meta/slugos-packages.bb"
# from [738a66a4cd05dd74381dce0949ddcd547be2497f]
# to [3e624519aa3c29fb9c243930483b6363f1b191b9]
#
# patch "packages/redboot-utils/fis_1.0.bb"
# from [423fde1a30e871e390b48542349b88efb3a07ac9]
# to [16fa3c9f589d8b24e84de8555dad50affd97b735]
#
============================================================
--- packages/meta/slugos-packages.bb 738a66a4cd05dd74381dce0949ddcd547be2497f
+++ packages/meta/slugos-packages.bb 3e624519aa3c29fb9c243930483b6363f1b191b9
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r35"
+PR = "r36"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2"
@@ -37,6 +37,7 @@ SLUGOS_PACKAGES = "\
binutils \
bison \
bluez-utils \
+ bluez-hcidump \
bogofilter \
boost \
bridge-utils \
============================================================
--- packages/redboot-utils/fis_1.0.bb 423fde1a30e871e390b48542349b88efb3a07ac9
+++ packages/redboot-utils/fis_1.0.bb 16fa3c9f589d8b24e84de8555dad50affd97b735
@@ -1,7 +1,7 @@ DESCRIPTION = "Tool to edit the Redboot
DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
-PR = "r4"
+PR = "r5"
-SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http"
+SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http;rev=6"
S="${WORKDIR}/trunk"
export CFLAGS += "--std=c99"
#
# mt diff -ra8f3bafcb48eddb52c9b4c0eae2518264f20ea14 -rb78f2dc352e2e9c1e3c7c2020293e603d6c2a7b8
#
#
#
# add_file "packages/gcc/gcc-cross-initial.inc"
# content [ac38b14b3c634b0aa2af45a7c226e750ebdc379f]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [bb0d6348c54d13071b292eabc79c21b87ad68708]
# to [856bf7364f21ec188e4ce2f7c98e3a9a8dd0c6b7]
#
# patch "packages/gcc/gcc-cross-initial_3.3.3.bb"
# from [90459ff2a3f98761dbdbe9e978651424a1bc2a04]
# to [4edb5622c405b0073d8f2e86b31a7298338368ea]
#
# patch "packages/gcc/gcc-cross-initial_3.3.4.bb"
# from [90459ff2a3f98761dbdbe9e978651424a1bc2a04]
# to [4edb5622c405b0073d8f2e86b31a7298338368ea]
#
# patch "packages/gcc/gcc-cross-initial_3.4.3.bb"
# from [1328890d1bb8378bf38807778fabf8519fc06d1a]
# to [4edb5622c405b0073d8f2e86b31a7298338368ea]
#
# patch "packages/gcc/gcc-cross-initial_3.4.4.bb"
# from [1328890d1bb8378bf38807778fabf8519fc06d1a]
# to [4edb5622c405b0073d8f2e86b31a7298338368ea]
#
# patch "packages/gcc/gcc-cross-initial_4.0.2.bb"
# from [a37774895cdec33f177e79d7d20efb8bb3a93385]
# to [fd7cd06ecb48f92b8528b98dc0f1efec6bcf4aaa]
#
# patch "packages/gcc/gcc-cross-initial_4.1.0.bb"
# from [7820cd16078d41cfc1e61af5ec45f1fbe7835156]
# to [c9b958214de00fddf6a53c3627db2faca6c8c588]
#
# patch "packages/gcc/gcc-cross-initial_4.1.1.bb"
# from [7820cd16078d41cfc1e61af5ec45f1fbe7835156]
# to [c9b958214de00fddf6a53c3627db2faca6c8c588]
#
# patch "packages/gcc/gcc-cross-initial_4.1.2.bb"
# from [7820cd16078d41cfc1e61af5ec45f1fbe7835156]
# to [c9b958214de00fddf6a53c3627db2faca6c8c588]
#
# patch "packages/gcc/gcc-cross-initial_4.2.1.bb"
# from [7820cd16078d41cfc1e61af5ec45f1fbe7835156]
# to [c9b958214de00fddf6a53c3627db2faca6c8c588]
#
# patch "packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb"
# from [1328890d1bb8378bf38807778fabf8519fc06d1a]
# to [4edb5622c405b0073d8f2e86b31a7298338368ea]
#
# patch "packages/gcc/gcc-cross-initial_csl-arm-cvs.bb"
# from [1328890d1bb8378bf38807778fabf8519fc06d1a]
# to [4edb5622c405b0073d8f2e86b31a7298338368ea]
#
# patch "packages/gcc/gcc-cross_4.1.0.bb"
# from [916fc24a922221b419d60b6151d0ae0c5be5caa4]
# to [bf68820e6969c1a4dad95194156ccc2bd43c46f9]
#
# patch "packages/gcc/gcc-cross_4.1.1.bb"
# from [1b087988c3814b688c360b580f5b82e04eba58cf]
# to [0b0ef8454b3e129e9fdbaf711c5a2fb95d696c75]
#
# patch "packages/gcc/gcc-cross_4.1.2.bb"
# from [36019aa250fcf94fb16c8f3adab162249c9d8053]
# to [83d6c7ddf9a8d01c94ed440c4e431306ae3dcd81]
#
# patch "packages/gcc/gcc-cross_4.2.1.bb"
# from [be2f2c53bbd220132778e60f9e959c8e95466e72]
# to [e32d37ba80f15300c2db6d0edcc1ede5e4b98c2a]
#
# patch "packages/gcc/gcc-package-cross.inc"
# from [33123161f819b3d5d09d65348d181f6fc9c897a7]
# to [f115236a51712a96d6f59cc160292498b3579766]
#
# patch "packages/gcc/gcc-package-sdk.inc"
# from [371ce0d18607bf95321025378912c51a2bd28f12]
# to [500f25d0e8d3f040092ef2dda341a183764b280a]
#
# patch "packages/gcc/gcc4-build.inc"
# from [724b5fa1e5771686d8f92b83f4a4c6a67fb05d0c]
# to [37aef6b1b9c21e9d620f2d1624aa43850ad2dfc3]
#
# patch "packages/gcc/gcc_4.0.2.bb"
# from [08e1499a8ecdbe234da9108f40268bf6db11bf63]
# to [974343b9064851c8a4269daa09a344738c7819f2]
#
# patch "packages/gcc/gcc_4.1.0.bb"
# from [d7757e27938020db94e7e36ec4fe75df630b01a7]
# to [c214142e3085b1c1c6c8f256fd775ae8a806e012]
#
# patch "packages/gcc/gcc_4.1.1.bb"
# from [ec4016cd35fe9bc8bb774d1827255d6350277cd3]
# to [8e2e89fd333b81001c31085136fec6cbacb242c7]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [9898246aa60cafd67aec15702e2857dd9a13c54e]
# to [1bcca958ef7fe579cf9ef8cb370434924b1fa029]
#
# patch "packages/gcc/gcc_4.2.1.bb"
# from [cf5a7ff85d01add9d5ee5a5f6fc4db5df067224e]
# to [1db32e8068ef1d5187d2bfb473ca50ab44d60e2b]
#
# patch "packages/gstreamer/gst-plugins.inc"
# from [5dc5a74a21bc2ea4d9870acdac9615b821137cec]
# to [323b766f22b064bf84e18c07ec7ab45b978d73ef]
#
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
# from [9a0b682073222bc2809e001ffe275c358bde77ed]
# to [5c8d9b5867669d654a875bd9b3a202b283d0dade]
#
============================================================
--- packages/gcc/gcc-cross-initial.inc ac38b14b3c634b0aa2af45a7c226e750ebdc379f
+++ packages/gcc/gcc-cross-initial.inc ac38b14b3c634b0aa2af45a7c226e750ebdc379f
@@ -0,0 +1,25 @@
+DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', '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-shared \
+ --disable-threads \
+ --disable-multilib \
+ --disable-__cxa_atexit \
+ --enable-languages=c \
+ --enable-target-optspace \
+ --program-prefix=${TARGET_PREFIX} \
+ ${@get_gcc_fpu_setting(bb, d)}"
+
+do_stage_prepend () {
+ mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
+ ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
+}
+
+do_install () {
+ :
+}
============================================================
--- conf/distro/include/sane-srcrevs.inc bb0d6348c54d13071b292eabc79c21b87ad68708
+++ conf/distro/include/sane-srcrevs.inc 856bf7364f21ec188e4ce2f7c98e3a9a8dd0c6b7
@@ -8,9 +8,9 @@ SRCREV_pn-dfu-util-native ?= "2866"
SRCREV_pn-bfin-uclibc ?= "1806"
SRCREV_pn-dfu-util ?= "2866"
SRCREV_pn-dfu-util-native ?= "2866"
-SRCREV_pn-eglibc ?= "3468"
-SRCREV_pn-eglibc-initial ?= "3468"
-SRCREV_pn-eglibc-intermediate ?= "3468"
+SRCREV_pn-eglibc ?= "3531"
+SRCREV_pn-eglibc-initial ?= "3531"
+SRCREV_pn-eglibc-intermediate ?= "3531"
SRCREV_pn-ezxd ?= "2058"
SRCREV_pn-elf2flt="1786"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
============================================================
--- packages/gcc/gcc-cross-initial_3.3.3.bb 90459ff2a3f98761dbdbe9e978651424a1bc2a04
+++ packages/gcc/gcc-cross-initial_3.3.3.bb 4edb5622c405b0073d8f2e86b31a7298338368ea
@@ -1,29 +1,2 @@
-SECTION = "devel"
require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', '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-shared \
- --disable-threads \
- --disable-multilib \
- --disable-__cxa_atexit \
- --enable-languages=c \
- --enable-target-optspace \
- --program-prefix=${TARGET_PREFIX} \
- ${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
- mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}
- ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${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
-}
============================================================
--- packages/gcc/gcc-cross-initial_3.3.4.bb 90459ff2a3f98761dbdbe9e978651424a1bc2a04
+++ packages/gcc/gcc-cross-initial_3.3.4.bb 4edb5622c405b0073d8f2e86b31a7298338368ea
@@ -1,29 +1,2 @@
-SECTION = "devel"
require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', '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-shared \
- --disable-threads \
- --disable-multilib \
- --disable-__cxa_atexit \
- --enable-languages=c \
- --enable-target-optspace \
- --program-prefix=${TARGET_PREFIX} \
- ${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
- mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}
- ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${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
-}
============================================================
--- packages/gcc/gcc-cross-initial_3.4.3.bb 1328890d1bb8378bf38807778fabf8519fc06d1a
+++ packages/gcc/gcc-cross-initial_3.4.3.bb 4edb5622c405b0073d8f2e86b31a7298338368ea
@@ -1,28 +1,2 @@ require gcc-cross_${PV}.bb
require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', '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-shared \
- --disable-threads \
- --disable-multilib \
- --disable-__cxa_atexit \
- --enable-languages=c \
- --enable-target-optspace \
- --program-prefix=${TARGET_PREFIX} \
- ${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
- mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
- ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
-}
============================================================
--- packages/gcc/gcc-cross-initial_3.4.4.bb 1328890d1bb8378bf38807778fabf8519fc06d1a
+++ packages/gcc/gcc-cross-initial_3.4.4.bb 4edb5622c405b0073d8f2e86b31a7298338368ea
@@ -1,28 +1,2 @@ require gcc-cross_${PV}.bb
require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', '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-shared \
- --disable-threads \
- --disable-multilib \
- --disable-__cxa_atexit \
- --enable-languages=c \
- --enable-target-optspace \
- --program-prefix=${TARGET_PREFIX} \
- ${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
- mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
- ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
-}
============================================================
--- packages/gcc/gcc-cross-initial_4.0.2.bb a37774895cdec33f177e79d7d20efb8bb3a93385
+++ packages/gcc/gcc-cross-initial_4.0.2.bb fd7cd06ecb48f92b8528b98dc0f1efec6bcf4aaa
@@ -1,29 +1,4 @@ require gcc-cross_${PV}.bb
require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
+EXTRA_OECONF += "--disable-multilib"
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', '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-shared \
- --disable-threads \
- --disable-multilib \
- --disable-__cxa_atexit \
- --disable-libmudflap \
- --enable-languages=c \
- --enable-target-optspace \
- --program-prefix=${TARGET_PREFIX} \
- ${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
- mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
- ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
-}
============================================================
--- packages/gcc/gcc-cross-initial_4.1.0.bb 7820cd16078d41cfc1e61af5ec45f1fbe7835156
+++ packages/gcc/gcc-cross-initial_4.1.0.bb c9b958214de00fddf6a53c3627db2faca6c8c588
@@ -1,30 +1,5 @@ require gcc-cross_${PV}.bb
require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
+EXTRA_OECONF += "--disable-libmudflap \
+ --disable-libssp"
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', '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-shared \
- --disable-threads \
- --disable-multilib \
- --disable-__cxa_atexit \
- --disable-libmudflap \
- --disable-libssp \
- --enable-languages=c \
- --enable-target-optspace \
- --program-prefix=${TARGET_PREFIX} \
- ${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
- mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
- ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
-}
============================================================
--- packages/gcc/gcc-cross-initial_4.1.1.bb 7820cd16078d41cfc1e61af5ec45f1fbe7835156
+++ packages/gcc/gcc-cross-initial_4.1.1.bb c9b958214de00fddf6a53c3627db2faca6c8c588
@@ -1,30 +1,5 @@ require gcc-cross_${PV}.bb
require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
+EXTRA_OECONF += "--disable-libmudflap \
+ --disable-libssp"
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', '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-shared \
- --disable-threads \
- --disable-multilib \
- --disable-__cxa_atexit \
- --disable-libmudflap \
- --disable-libssp \
- --enable-languages=c \
- --enable-target-optspace \
- --program-prefix=${TARGET_PREFIX} \
- ${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
- mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
- ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
-}
============================================================
--- packages/gcc/gcc-cross-initial_4.1.2.bb 7820cd16078d41cfc1e61af5ec45f1fbe7835156
+++ packages/gcc/gcc-cross-initial_4.1.2.bb c9b958214de00fddf6a53c3627db2faca6c8c588
@@ -1,30 +1,5 @@ require gcc-cross_${PV}.bb
require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
+EXTRA_OECONF += "--disable-libmudflap \
+ --disable-libssp"
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', '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-shared \
- --disable-threads \
- --disable-multilib \
- --disable-__cxa_atexit \
- --disable-libmudflap \
- --disable-libssp \
- --enable-languages=c \
- --enable-target-optspace \
- --program-prefix=${TARGET_PREFIX} \
- ${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
- mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
- ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
-}
============================================================
--- packages/gcc/gcc-cross-initial_4.2.1.bb 7820cd16078d41cfc1e61af5ec45f1fbe7835156
+++ packages/gcc/gcc-cross-initial_4.2.1.bb c9b958214de00fddf6a53c3627db2faca6c8c588
@@ -1,30 +1,5 @@ require gcc-cross_${PV}.bb
require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
+EXTRA_OECONF += "--disable-libmudflap \
+ %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list