[oe-commits] org.oe.dev merge of '0573649abd1cf5b9f42a282ceefd2a99912dae21'

koen commit openembedded-commits at lists.openembedded.org
Mon Dec 3 16:06:46 UTC 2007


merge of '0573649abd1cf5b9f42a282ceefd2a99912dae21'
     and 'a5835e350969f436aec7b4c92890a1e73dcd6c3e'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 05d1f0adf157e02dbf7c03055e62863c152bd956
ViewMTN: http://monotone.openembedded.org/revision/info/05d1f0adf157e02dbf7c03055e62863c152bd956
Files:
1
conf/distro/angstrom-2007.1.conf
packages/tasks/task-base.bb
packages/gcc/gcc-cross_3.3.3.bb
packages/gcc/gcc-cross_3.3.4.bb
packages/gcc/gcc-cross_3.4.3.bb
packages/gcc/gcc-cross_3.4.4.bb
packages/gcc/gcc-cross_4.0.0.bb
packages/gcc/gcc-cross_4.0.2.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-cross_4.2.2.bb
packages/gcc/gcc-cross_csl-arm-2005q3.bb
packages/gcc/gcc-cross_csl-arm-cvs.bb
packages/gcc/gcc-cross_csl-arm.bb
packages/gcc/gcc3-build.inc
packages/gcc/gcc_3.3.3.bb
packages/gcc/gcc_3.3.4.bb
packages/gcc/gcc_3.4.3.bb
packages/gcc/gcc_3.4.4.bb
packages/gcc/gcc_4.0.0.bb
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/gcc/gcc_4.2.2.bb
packages/gcc/gcc_csl-arm-2005q3.bb
packages/gcc/gcc_csl-arm-cvs.bb
packages/gcc/gcc_csl-arm.bb
Diffs:

#
# mt diff -r0573649abd1cf5b9f42a282ceefd2a99912dae21 -r05d1f0adf157e02dbf7c03055e62863c152bd956
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [c6bbfa10816eda24513e92b21827c75003bb4daa]
#    to [0333915fd642b2db9af96929a6b9fd60df4292bc]
# 
# patch "packages/tasks/task-base.bb"
#  from [b2823ec6e2856d6da043897a85b48aed6eb6d596]
#    to [bd9f0978ca2a00519da16302f7e73d3fad3879fd]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	c6bbfa10816eda24513e92b21827c75003bb4daa
+++ conf/distro/angstrom-2007.1.conf	0333915fd642b2db9af96929a6b9fd60df4292bc
@@ -60,7 +60,7 @@ PCMCIA_MANAGER = "pcmciautils"
 PCMCIA_MANAGER = "pcmciautils"
 
 #Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh18"
+PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh19"
 PREFERRED_VERSION_linux-ixp4xx                      ?= "2.6.21.6+svnr${SRCREV}"
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
============================================================
--- packages/tasks/task-base.bb	b2823ec6e2856d6da043897a85b48aed6eb6d596
+++ packages/tasks/task-base.bb	bd9f0978ca2a00519da16302f7e73d3fad3879fd
@@ -6,42 +6,41 @@ PACKAGES = ' \
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
 PACKAGES = ' \
-            task-base task-base-dev task-base-dbg\
-            task-base-extended task-base-extended-dev task-base-extended-dbg \
-            task-distro-base task-distro-base-dev task-distro-base-dbg \
-            task-machine-base task-machine-base-dev task-machine-base-dbg \
+            task-base \
+            task-base-extended \
+            task-distro-base \
+            task-machine-base \
             \
-            ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi task-base-acpi-dev task-base-acpi-dbg", "",d)} \
-            ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa task-base-alsa-dev task-base-alsa-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm task-base-apm-dev task-base-apm-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2 task-base-ext2-dev task-base-ext2-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda task-base-irda-dev task-base-irda-dbg", "",d)} \
-            ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard task-base-keyboard-dev task-base-keyboard-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci task-base-pci-dev task-base-pci-dbg", "",d)} \
-            ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia task-base-pcmcia-dev task-base-pcmcia-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone task-base-phone-dev task-base-phone-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen task-base-screen-dev task-base-screen-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial task-base-serial-dev task-base-serial-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen task-base-touchscreen-dev task-base-touchscreen-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget task-base-usbgadget-dev task-base-usbgadget-dbg", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost task-base-usbhost-dev task-base-usbhost-dbg", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost", "", d)} \
             \
-            ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot task-base-uboot-dev task-base-uboot-dbg", "",d)} \
-            ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot task-base-redboot-dev task-base-redboot-dbg", "",d)} \
-            ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex task-base-apex-dev task-base-apex-dbg", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex", "",d)} \
             \
-            task-base-bluetooth task-base-bluetooth-dev task-base-bluetooth-dbg \
-            task-base-wifi task-base-wifi-dev task-base-wifi-dbg \
+            task-base-bluetooth \
+            task-base-wifi \
             \
+            ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
             \
-            ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs task-base-cramfs-dev task-base-cramfs-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec task-base-ipsec-dev task-base-ipsec-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6 task-base-ipv6-dev task-base-ipv6-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs task-base-nfs-dev task-base-nfs-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp task-base-ppp-dev task-base-ppp-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs task-base-smbfs-dev task-base-smbfs-dbg", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid task-base-raid-dev task-base-raid-dbg", "",d)} \
-            \
             ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
             '
 


#
# mt diff -ra5835e350969f436aec7b4c92890a1e73dcd6c3e -r05d1f0adf157e02dbf7c03055e62863c152bd956
#
# 
# 
# patch "packages/gcc/gcc-cross_3.3.3.bb"
#  from [6f0e806dc7fb34d2c7d4d2c58d2af5788bda69fd]
#    to [c8731c9792969eb812d5bd7fa81169abe1943c6a]
# 
# patch "packages/gcc/gcc-cross_3.3.4.bb"
#  from [8fbba8dba7728294fafecfd421f1e109e04062f4]
#    to [ec2a0f85762af032808eb5b2f66ed466cea31b3d]
# 
# patch "packages/gcc/gcc-cross_3.4.3.bb"
#  from [a322dd0e92ed9ba15ff42b79006c5ef02a9c8f63]
#    to [ce70bdb3ff0e605e841fa835bc20169914ea708a]
# 
# patch "packages/gcc/gcc-cross_3.4.4.bb"
#  from [b8e7c52063da4c9ec308b938054e366687c4ba1b]
#    to [674605b2ebdca6409f1f687a9e7245c47464037d]
# 
# patch "packages/gcc/gcc-cross_4.0.0.bb"
#  from [3e8b17aa2b3b3c9889b1a5dce21167633321f10f]
#    to [c79d4560cc3836f3ce5567ced695e38cd89cf6ff]
# 
# patch "packages/gcc/gcc-cross_4.0.2.bb"
#  from [c6d782f90db8ef7469907dbe927e7658eeef4380]
#    to [a6084e5e13c9ec9dd14a200160e5084964df24f4]
# 
# patch "packages/gcc/gcc-cross_4.1.0.bb"
#  from [45388d846b16babd384838804fecc6bca37d6ee2]
#    to [4f00addbaa7626b70215367ef53de6d49b4c6a7e]
# 
# patch "packages/gcc/gcc-cross_4.1.1.bb"
#  from [02563fd2f77f8a3edb59f78ce061728160b4b50a]
#    to [58ae5981f8140e05dac1bd3269a880d0ddbbd0d6]
# 
# patch "packages/gcc/gcc-cross_4.1.2.bb"
#  from [08a75f7777c10e0526242d4021330547bddfd7d3]
#    to [110264dc0f77a52cf1c9af1c384778715c290d17]
# 
# patch "packages/gcc/gcc-cross_4.2.1.bb"
#  from [8c369284668b4f7e7cd8104c4e8ee7df156518d9]
#    to [5ef221a66a8deb2c9907050226443b591077ebc2]
# 
# patch "packages/gcc/gcc-cross_4.2.2.bb"
#  from [fb8c2385fd08a3e2000d725d7155b0118591e2b7]
#    to [db2829fa431c6b82c542cae426ddc639e77aa4db]
# 
# patch "packages/gcc/gcc-cross_csl-arm-2005q3.bb"
#  from [620960ed7c7528e82c79547f5a83220a7b925cbc]
#    to [cf1c1b76e78fa9d9b44d86914d69b86725561090]
# 
# patch "packages/gcc/gcc-cross_csl-arm-cvs.bb"
#  from [72b603afec09044056748f35d3ecfe875cf7d2cb]
#    to [f4cef10fc748bb75954b41429d56a9a103075703]
# 
# patch "packages/gcc/gcc-cross_csl-arm.bb"
#  from [d4d43252930c1c95e56323cadc16dca4305bb6e2]
#    to [8d4cc844ecafb7450db0a445be3261b3481dfc48]
# 
# patch "packages/gcc/gcc3-build.inc"
#  from [fd1d8e1a435e000a557d01da93aafa359e8f84ba]
#    to [c1c9b784bd453918cc0c06e9c135a752ed896c73]
# 
# patch "packages/gcc/gcc_3.3.3.bb"
#  from [f2de34b11bd556c90a0c261c303e4775ba238ba7]
#    to [6f5679ab6302d65b9cc1de9ca186011573c1d75a]
# 
# patch "packages/gcc/gcc_3.3.4.bb"
#  from [97a6eb12ca7216f331610a86b2a2626dfe946d7f]
#    to [b7c6e045d8bbd233c2353965670b5a355468c90d]
# 
# patch "packages/gcc/gcc_3.4.3.bb"
#  from [49e5bdf8e913ce51cbe10c8123ec4c8222cee6de]
#    to [68d2755766c4adc56e0951a6de246394270d7d9f]
# 
# patch "packages/gcc/gcc_3.4.4.bb"
#  from [704138b111356a365db42ff4e06d2cbed273572e]
#    to [8218fda182662f3f4bcb0f5857619e901d8b6484]
# 
# patch "packages/gcc/gcc_4.0.0.bb"
#  from [cecd6ee67910ba3a102d08f3e64fa697dc807f38]
#    to [a8f79504565dce0ccceb3bced8c8c874caf13f5e]
# 
# patch "packages/gcc/gcc_4.0.2.bb"
#  from [974343b9064851c8a4269daa09a344738c7819f2]
#    to [0156b0ed1e59ed7e6319931b8637568457eb1a94]
# 
# patch "packages/gcc/gcc_4.1.0.bb"
#  from [f35337d98d662c86f98faa30e09d3a4a0c8e5422]
#    to [969b03f6753406d3c1fc57118391e227359539c8]
# 
# patch "packages/gcc/gcc_4.1.1.bb"
#  from [7134e088d48fb7b045110619d8f83e6e71f809e4]
#    to [ba26064f61c07690d6fc9e80c2083fa783cec5ff]
# 
# patch "packages/gcc/gcc_4.1.2.bb"
#  from [68eac9378be7e37e7c220f6cc6c2e8e2918b3821]
#    to [66c1a6be00672f5a37ab8c37aaee4c3c6b0713d6]
# 
# patch "packages/gcc/gcc_4.2.1.bb"
#  from [bbd5cdf1af6cbc7657cac1beb5869b7583d63035]
#    to [755943c06b7920f669b3a3f3e1baf2e9d2a97645]
# 
# patch "packages/gcc/gcc_4.2.2.bb"
#  from [9431e24ceb8ddbf95f188a082285df6221e06508]
#    to [53244c4e795291ca862fb5b92fb62d5191081c67]
# 
# patch "packages/gcc/gcc_csl-arm-2005q3.bb"
#  from [8da5c18425c9c55a4af88ece5a0f5b9bc932cb75]
#    to [ad2f03778a959baa857452a7fd577ac3b58442f1]
# 
# patch "packages/gcc/gcc_csl-arm-cvs.bb"
#  from [32372dbc5acdc5140d5e1e72ba9d411bbff82661]
#    to [5c616f992fbd43d7d08e27e1ee87b070a8744385]
# 
# patch "packages/gcc/gcc_csl-arm.bb"
#  from [c5d6da9de408aa3b9f50fe693976df60f07d258f]
#    to [be88b779fd830c2162ec449171ff0dfe44217010]
# 
============================================================
--- packages/gcc/gcc-cross_3.3.3.bb	6f0e806dc7fb34d2c7d4d2c58d2af5788bda69fd
+++ packages/gcc/gcc-cross_3.3.3.bb	c8731c9792969eb812d5bd7fa81169abe1943c6a
@@ -1,6 +1,7 @@ inherit cross
 SECTION = "devel"
 require gcc_${PV}.bb
 inherit cross
+
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
============================================================
--- packages/gcc/gcc-cross_3.3.4.bb	8fbba8dba7728294fafecfd421f1e109e04062f4
+++ packages/gcc/gcc-cross_3.3.4.bb	ec2a0f85762af032808eb5b2f66ed466cea31b3d
@@ -1,10 +1,10 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 SECTION = "devel"
 require gcc_${PV}.bb
 require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
-PR="r5"
+PR="r6"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_3.4.3.bb	a322dd0e92ed9ba15ff42b79006c5ef02a9c8f63
+++ packages/gcc/gcc-cross_3.4.3.bb	ce70bdb3ff0e605e841fa835bc20169914ea708a
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r11"
+PR = "r12"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_3.4.4.bb	b8e7c52063da4c9ec308b938054e366687c4ba1b
+++ packages/gcc/gcc-cross_3.4.4.bb	674605b2ebdca6409f1f687a9e7245c47464037d
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_4.0.0.bb	3e8b17aa2b3b3c9889b1a5dce21167633321f10f
+++ packages/gcc/gcc-cross_4.0.0.bb	c79d4560cc3836f3ce5567ced695e38cd89cf6ff
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_4.0.2.bb	c6d782f90db8ef7469907dbe927e7658eeef4380
+++ packages/gcc/gcc-cross_4.0.2.bb	a6084e5e13c9ec9dd14a200160e5084964df24f4
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r8"
+PR = "r9"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_4.1.0.bb	45388d846b16babd384838804fecc6bca37d6ee2
+++ packages/gcc/gcc-cross_4.1.0.bb	4f00addbaa7626b70215367ef53de6d49b4c6a7e
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_4.1.1.bb	02563fd2f77f8a3edb59f78ce061728160b4b50a
+++ packages/gcc/gcc-cross_4.1.1.bb	58ae5981f8140e05dac1bd3269a880d0ddbbd0d6
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r16"
+PR = "r17"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_4.1.2.bb	08a75f7777c10e0526242d4021330547bddfd7d3
+++ packages/gcc/gcc-cross_4.1.2.bb	110264dc0f77a52cf1c9af1c384778715c290d17
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .bb changes something that affects its *build*
 # remember to increment this one too.
-PR = "r12"
+PR = "r13"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_4.2.1.bb	8c369284668b4f7e7cd8104c4e8ee7df156518d9
+++ packages/gcc/gcc-cross_4.2.1.bb	5ef221a66a8deb2c9907050226443b591077ebc2
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r9"
+PR = "r10"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_4.2.2.bb	fb8c2385fd08a3e2000d725d7155b0118591e2b7
+++ packages/gcc/gcc-cross_4.2.2.bb	db2829fa431c6b82c542cae426ddc639e77aa4db
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_csl-arm-2005q3.bb	620960ed7c7528e82c79547f5a83220a7b925cbc
+++ packages/gcc/gcc-cross_csl-arm-2005q3.bb	cf1c1b76e78fa9d9b44d86914d69b86725561090
@@ -1,10 +1,10 @@ inherit cross
 require gcc_csl-arm-2005q3.bb
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_csl-arm-cvs.bb	72b603afec09044056748f35d3ecfe875cf7d2cb
+++ packages/gcc/gcc-cross_csl-arm-cvs.bb	f4cef10fc748bb75954b41429d56a9a103075703
@@ -1,10 +1,10 @@ inherit cross
 require gcc_csl-arm-cvs.bb
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_csl-arm.bb	d4d43252930c1c95e56323cadc16dca4305bb6e2
+++ packages/gcc/gcc-cross_csl-arm.bb	8d4cc844ecafb7450db0a445be3261b3481dfc48
@@ -1,10 +1,10 @@ inherit cross
 require gcc_csl-arm.bb
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc3-build.inc	fd1d8e1a435e000a557d01da93aafa359e8f84ba
+++ packages/gcc/gcc3-build.inc	c1c9b784bd453918cc0c06e9c135a752ed896c73
@@ -39,10 +39,12 @@ EXTRA_OECONF_PATHS = " \
                       --with-local-prefix=${prefix}/local \
                       --with-gxx-include-dir=${includedir}/c++/${BINV}"
 
-EXTRA_OECONF_DEP = ""
-EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
-EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
-EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
+# Build uclibc compilers without cxa_atexit support
+EXTRA_OECONF_append_linux               = " --enable-__cxa_atexit"
+EXTRA_OECONF_append_linux-gnueabi       = " --enable-__cxa_atexit"
+EXTRA_OECONF_append_linux-uclibc        = " --disable-__cxa_atexit"
+EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit"
+EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
 CPPFLAGS = ""
 
 # Used by configure to define additional values for FLAGS_FOR_TARGET -
@@ -56,19 +58,6 @@ require gcc-fpu.inc
 
 require gcc-fpu.inc
 
-python __anonymous () {
-    import bb, re
-    if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
-    elif (re.match('linux-uclibcgnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
-    elif (re.match('linux-gnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-           bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
-    elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
-
-}
-
 do_configure () {
 	# Setup these vars for cross building only
 	# ... because foo_FOR_TARGET apparently gets misinterpreted inside the
============================================================
--- packages/gcc/gcc_3.3.3.bb	f2de34b11bd556c90a0c261c303e4775ba238ba7
+++ packages/gcc/gcc_3.3.3.bb	6f5679ab6302d65b9cc1de9ca186011573c1d75a
@@ -1,5 +1,5 @@ SECTION = "devel"
 SECTION = "devel"
-PR = "r2"
+PR = "r3"
 inherit autotools gettext
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
============================================================
--- packages/gcc/gcc_3.3.4.bb	97a6eb12ca7216f331610a86b2a2626dfe946d7f
+++ packages/gcc/gcc_3.3.4.bb	b7c6e045d8bbd233c2353965670b5a355468c90d
@@ -1,5 +1,5 @@ SECTION = "devel"
 SECTION = "devel"
-PR = "r2"
+PR = "r3"
 inherit autotools gettext
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
============================================================
--- packages/gcc/gcc_3.4.3.bb	49e5bdf8e913ce51cbe10c8123ec4c8222cee6de
+++ packages/gcc/gcc_3.4.3.bb	68d2755766c4adc56e0951a6de246394270d7d9f
@@ -1,4 +1,4 @@
-PR = "r11"
+PR = "r12"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
============================================================
--- packages/gcc/gcc_3.4.4.bb	704138b111356a365db42ff4e06d2cbed273572e
+++ packages/gcc/gcc_3.%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list