[oe-commits] org.oe.dev merge of '58f3d45c535ca2e847a96727f15d71f43b0fe468'
thesing commit
oe at amethyst.openembedded.net
Fri Apr 4 11:57:44 UTC 2008
merge of '58f3d45c535ca2e847a96727f15d71f43b0fe468'
and 'd8ca7c9582946cb5d871bb08cc67c3739e85b1c2'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 5be1694af54efe619f89c634867bc6aa9bbe54be
ViewMTN: http://monotone.openembedded.org/revision/info/5be1694af54efe619f89c634867bc6aa9bbe54be
Files:
1
packages/glibc/eglibc_svn.bb
packages/glibc/glibc.inc
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/glibc/glibc_cvs.bb
packages/classpath/classpath-minimal_0.97.bb
packages/classpath/classpath_0.97.bb
packages/classpath/classpath-minimal_0.97.1.bb
packages/classpath/classpath_0.97.1.bb
Diffs:
#
# mt diff -r58f3d45c535ca2e847a96727f15d71f43b0fe468 -r5be1694af54efe619f89c634867bc6aa9bbe54be
#
#
#
# patch "packages/glibc/eglibc_svn.bb"
# from [cb974e86b28e37ab0ea845060367eb8c4e91a117]
# to [1328dce82f5660e9a4ffa188f48b4f362872208a]
#
# patch "packages/glibc/glibc.inc"
# from [e9a2a880277298ca08e7f53a4e5c69127415a5ed]
# to [94a32473f1193137d45da97d6ed786ae9e755094]
#
# patch "packages/glibc/glibc_2.2.5.bb"
# from [3d1bd1a720c5abaa3b42442f987772ecd2eb42ab]
# to [34af38798fe6eb076ee1e44612cfb2e740abf174]
#
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
# from [4d898b91a2840cd06b8471e3dd810cfaad1f8766]
# to [808ed86ced75140a1d3fc3218b2496f9cc4bf940]
#
# patch "packages/glibc/glibc_2.3.2.bb"
# from [b0f7c4497560c2dde6b48a9961d91b310f8a47b7]
# to [c9271dd5bdf2fac00df5b90d4757176c5c7bb687]
#
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
# from [05d20a34a2d2225af3c8d5149a3158a9c2d14f6f]
# to [de5dc3446aa94c3abfdc1f8edff39f19084142f7]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
# from [bd0d5c36cebcff81c42b194508902193fca177b0]
# to [cb07d9d3c55c4fcfc23ddfe1650281885b9ea5f6]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
# from [19c9e2bd087f04ab2e44d5baafdd7ccd428f86c7]
# to [07a49aaf94192d47ee2118328e09b13cf4c5aaa4]
#
# patch "packages/glibc/glibc_2.3.3.bb"
# from [682047d9f499de426cd3e8ceb45b9eb03d703156]
# to [94f418faf76e360cb344f13e886941c63faeaa1c]
#
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
# from [c8fa5f79d6b7a85274b7c696675c6181bfb4423e]
# to [002681533641cc0727653c163caa2b89d9554585]
#
# patch "packages/glibc/glibc_2.4.bb"
# from [6f8f5b26e247b17ac6456d6714d55cd940d438f0]
# to [90ea22d4701fd976ebf54996b4f0f0f75fcbcb15]
#
# patch "packages/glibc/glibc_2.5.bb"
# from [4448b5d00d178de9e03d1a43d7c5803abbb93d2c]
# to [0df9115aff23a65cf60cf318463e92afd9d4187d]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [5ed9c93ca660afcc61380030ee1d8c4340997ae3]
# to [d7da717daed6dd7a23f3d54789b6f28eafa6314a]
#
# patch "packages/glibc/glibc_2.7.bb"
# from [f62da4b0450f5fe51216328cf863ed074424defd]
# to [0315c4d0fd55ed746d83fbe2e7512ce1dfe46237]
#
# patch "packages/glibc/glibc_cvs.bb"
# from [a323893710dd11d890799f9dac684c444d445a8f]
# to [65a43c48f600ea8305861ae2b9bc8d44ac65c8d6]
#
============================================================
--- packages/glibc/eglibc_svn.bb cb974e86b28e37ab0ea845060367eb8c4e91a117
+++ packages/glibc/eglibc_svn.bb 1328dce82f5660e9a4ffa188f48b4f362872208a
@@ -3,7 +3,7 @@ PV = "2.7+svnr${SRCREV}"
DEFAULT_PREFERENCE = "-1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
PV = "2.7+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
SRC_URI = "svn://svn.eglibc.org;module=trunk \
file://etc/ld.so.conf \
file://generate-supported.mk"
============================================================
--- packages/glibc/glibc.inc e9a2a880277298ca08e7f53a4e5c69127415a5ed
+++ packages/glibc/glibc.inc 94a32473f1193137d45da97d6ed786ae9e755094
@@ -7,6 +7,8 @@ DEPENDS = "${@['virtual/${TARGET_PREFIX}
DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
#this leads to circular deps, so lets not add it yet
#RDEPENDS_ldd += " bash"
+# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this
+RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
PROVIDES += "virtual/libintl virtual/libiconv"
============================================================
--- packages/glibc/glibc_2.2.5.bb 3d1bd1a720c5abaa3b42442f987772ecd2eb42ab
+++ packages/glibc/glibc_2.2.5.bb 34af38798fe6eb076ee1e44612cfb2e740abf174
@@ -1,7 +1,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
require glibc.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r13"
+PR = "r14"
DEFAULT_PREFERENCE_sh3 = "-99"
============================================================
--- packages/glibc/glibc_2.3.2+cvs20040726.bb 4d898b91a2840cd06b8471e3dd810cfaad1f8766
+++ packages/glibc/glibc_2.3.2+cvs20040726.bb 808ed86ced75140a1d3fc3218b2496f9cc4bf940
@@ -3,7 +3,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r23"
+PR = "r24"
GLIBC_ADDONS ?= "linuxthreads"
============================================================
--- packages/glibc/glibc_2.3.2.bb b0f7c4497560c2dde6b48a9961d91b310f8a47b7
+++ packages/glibc/glibc_2.3.2.bb c9271dd5bdf2fac00df5b90d4757176c5c7bb687
@@ -1,6 +1,6 @@ require glibc.inc
require glibc.inc
-PR = "r12"
+PR = "r13"
DEFAULT_PREFERENCE_sh3 = "-99"
============================================================
--- packages/glibc/glibc_2.3.3+cvs20041128.bb 05d20a34a2d2225af3c8d5149a3158a9c2d14f6f
+++ packages/glibc/glibc_2.3.3+cvs20041128.bb de5dc3446aa94c3abfdc1f8edff39f19084142f7
@@ -3,7 +3,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r8"
+PR = "r9"
GLIBC_ADDONS ?= "linuxthreads"
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050221.bb bd0d5c36cebcff81c42b194508902193fca177b0
+++ packages/glibc/glibc_2.3.3+cvs20050221.bb cb07d9d3c55c4fcfc23ddfe1650281885b9ea5f6
@@ -3,7 +3,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r8"
+PR = "r9"
GLIBC_ADDONS ?= "linuxthreads"
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050420.bb 19c9e2bd087f04ab2e44d5baafdd7ccd428f86c7
+++ packages/glibc/glibc_2.3.3+cvs20050420.bb 07a49aaf94192d47ee2118328e09b13cf4c5aaa4
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r6"
+PR = "r7"
GLIBC_ADDONS ?= "linuxthreads"
============================================================
--- packages/glibc/glibc_2.3.3.bb 682047d9f499de426cd3e8ceb45b9eb03d703156
+++ packages/glibc/glibc_2.3.3.bb 94f418faf76e360cb344f13e886941c63faeaa1c
@@ -1,6 +1,6 @@ require glibc.inc
require glibc.inc
-PR = "r9"
+PR = "r10"
DEFAULT_PREFERENCE_sh3 = "-99"
============================================================
--- packages/glibc/glibc_2.3.5+cvs20050627.bb c8fa5f79d6b7a85274b7c696675c6181bfb4423e
+++ packages/glibc/glibc_2.3.5+cvs20050627.bb 002681533641cc0727653c163caa2b89d9554585
@@ -2,7 +2,7 @@ SRCDATE = "20050627"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
SRCDATE = "20050627"
-PR = "r15"
+PR = "r16"
#Doesnt build for sh3
DEFAULT_PREFERENCE_sh3="-1"
============================================================
--- packages/glibc/glibc_2.4.bb 6f8f5b26e247b17ac6456d6714d55cd940d438f0
+++ packages/glibc/glibc_2.4.bb 90ea22d4701fd976ebf54996b4f0f0f75fcbcb15
@@ -1,6 +1,6 @@ require glibc.inc
require glibc.inc
-PR = "r13"
+PR = "r14"
#add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
============================================================
--- packages/glibc/glibc_2.5.bb 4448b5d00d178de9e03d1a43d7c5803abbb93d2c
+++ packages/glibc/glibc_2.5.bb 0df9115aff23a65cf60cf318463e92afd9d4187d
@@ -1,5 +1,5 @@ require glibc.inc
require glibc.inc
-PR = "r10"
+PR = "r11"
ARM_INSTRUCTION_SET = "arm"
============================================================
--- packages/glibc/glibc_2.6.1.bb 5ed9c93ca660afcc61380030ee1d8c4340997ae3
+++ packages/glibc/glibc_2.6.1.bb d7da717daed6dd7a23f3d54789b6f28eafa6314a
@@ -1,5 +1,5 @@ require glibc.inc
require glibc.inc
-PR = "r3"
+PR = "r4"
ARM_INSTRUCTION_SET = "arm"
============================================================
--- packages/glibc/glibc_2.7.bb f62da4b0450f5fe51216328cf863ed074424defd
+++ packages/glibc/glibc_2.7.bb 0315c4d0fd55ed746d83fbe2e7512ce1dfe46237
@@ -5,7 +5,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev"
-PR = "r0"
+PR = "r1"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
============================================================
--- packages/glibc/glibc_cvs.bb a323893710dd11d890799f9dac684c444d445a8f
+++ packages/glibc/glibc_cvs.bb 65a43c48f600ea8305861ae2b9bc8d44ac65c8d6
@@ -1,7 +1,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
require glibc.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
-PR = "r6"
+PR = "r7"
PV = "2.3.5+cvs${SRCDATE}"
GLIBC_ADDONS ?= "ports,linuxthreads"
#
# mt diff -rd8ca7c9582946cb5d871bb08cc67c3739e85b1c2 -r5be1694af54efe619f89c634867bc6aa9bbe54be
#
#
#
# delete "packages/classpath/classpath-minimal_0.97.bb"
#
# delete "packages/classpath/classpath_0.97.bb"
#
# add_file "packages/classpath/classpath-minimal_0.97.1.bb"
# content [0ef04bfd389c769d1b67f97975fcdd35f68c4855]
#
# add_file "packages/classpath/classpath_0.97.1.bb"
# content [db8b170f0f6f53145caf1d439efa49971f8c4475]
#
============================================================
--- packages/classpath/classpath-minimal_0.97.1.bb 0ef04bfd389c769d1b67f97975fcdd35f68c4855
+++ packages/classpath/classpath-minimal_0.97.1.bb 0ef04bfd389c769d1b67f97975fcdd35f68c4855
@@ -0,0 +1,18 @@
+require classpath.inc
+
+PR = "r0"
+
+PROVIDES = "${PN} classpath"
+
+EXTRA_OECONF += "\
+ --enable-local-sockets \
+ --disable-alsa \
+ --disable-gconf-peer \
+ --disable-gtk-peer \
+ --disable-plugin \
+ --disable-dssi \
+ --disable-examples \
+ "
+
+CPPACKAGES = "${PBN}-common ${PBN}-tools"
+
============================================================
--- packages/classpath/classpath_0.97.1.bb db8b170f0f6f53145caf1d439efa49971f8c4475
+++ packages/classpath/classpath_0.97.1.bb db8b170f0f6f53145caf1d439efa49971f8c4475
@@ -0,0 +1,18 @@
+require classpath.inc
+
+PR = "r0"
+
+DEPENDS += "gtk+ gconf libxtst"
+
+EXTRA_OECONF += "\
+ --disable-alsa \
+ --disable-dssi \
+ --disable-qt4-peer \
+ --disable-plugin \
+ --enable-gconf-peer \
+ --enable-gtk-peer \
+ --enable-local-sockets \
+ --with-vm=java \
+ "
+
+
More information about the Openembedded-commits
mailing list