[oe-commits] org.oe.dev merge of '4c4e69889620b924d4a3277e83211f6f7f066c8c'

oe commit oe at amethyst.openembedded.net
Mon Sep 1 18:17:27 UTC 2008


merge of '4c4e69889620b924d4a3277e83211f6f7f066c8c'
     and '7fd15622321922163aab9fa955236c9a25de2e65'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: b5df7e6b304a3d45c76436fa5ba72556ffc23586
ViewMTN: http://monotone.openembedded.org/revision/info/b5df7e6b304a3d45c76436fa5ba72556ffc23586
Files:
1
packages/uclibc/files/arm_fix_alignment.patch
packages/uclibc/uclibc-0.9.29/arm_fix_alignment.patch
packages/uclibc/uclibc-cvs
packages/uclibc/uclibc-svn
packages/uclibc/uclibc-nptl
packages/python/python-numpy_1.1.1.bb
packages/uclibc/uclibc-0.9.29/uclibc-use-fgnu89-inline.patch
packages/uclibc/uclibc-initial_nptl.bb
packages/uclibc/uclibc-nptl/arm_fix_alignment.patch
packages/uclibc/uclibc-nptl/uClibc.distro
packages/uclibc/uclibc-nptl/uClibc.machine.armv5te
packages/uclibc/uclibc-svn/arm_fix_alignment.patch
packages/uclibc/uclibc_nptl.bb
conf/distro/include/sane-srcrevs.inc
packages/gcc/gcc-4.2.4.inc
packages/gcc/gcc-4.3.1/100-uclibc-conf.patch
packages/gcc/gcc-4.3.1/200-uclibc-locale.patch
packages/gcc/gcc-4.3.1/203-uclibc-locale-no__x.patch
packages/gcc/gcc-4.3.1/205-uclibc-locale-update.patch
packages/gcc/gcc-4.3.1/302-c99-snprintf.patch
packages/gcc/gcc-4.3.1/307-locale_facets.patch
packages/gcc/gcc-4.3.1/cache-amnesia.patch
packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.3.1.inc
packages/gcc/gcc-configure-common.inc
packages/gcc/gcc-cross-sdk_4.2.4.bb
packages/gcc/gcc-cross-sdk_4.3.1.bb
packages/gcc/gcc-cross_4.3.1.bb
packages/gcc/gcc_4.3.1.bb
packages/mozilla/firefox-3.0.1/mozconfig
packages/mozilla/firefox.inc
packages/mozilla/firefox_3.0.1.bb
packages/mythtv/gmyth-upnp_0.7.0.bb
packages/portaudio/portaudio-v19_svn.bb
packages/sugar/sugar-base_0.82.0.bb
packages/sugar/sugar-toolkit_0.82.1.bb
packages/tasks/task-openmoko-feed.bb
packages/uclibc/uclibc_0.9.29.bb
packages/uclibc/uclibc_svn.bb
packages/dbus-java/dbus-java_2.5.bb
packages/phoneme/phoneme-advanced.inc
Diffs:

#
# mt diff -r4c4e69889620b924d4a3277e83211f6f7f066c8c -rb5df7e6b304a3d45c76436fa5ba72556ffc23586
#
#
#
# rename "packages/uclibc/files/arm_fix_alignment.patch"
#     to "packages/uclibc/uclibc-0.9.29/arm_fix_alignment.patch"
# 
# rename "packages/uclibc/uclibc-cvs"
#     to "packages/uclibc/uclibc-svn"
# 
# add_dir "packages/uclibc/uclibc-nptl"
# 
# add_file "packages/python/python-numpy_1.1.1.bb"
#  content [94d5ee7200a201465655e3946ebf7b020628cd9b]
# 
# add_file "packages/uclibc/uclibc-0.9.29/uclibc-use-fgnu89-inline.patch"
#  content [5dfb9586fa43464af763ff774e15dc0418a181de]
# 
# add_file "packages/uclibc/uclibc-initial_nptl.bb"
#  content [6872f3dbf713d969e837fff3267dfe6c79cc7aa2]
# 
# add_file "packages/uclibc/uclibc-nptl/arm_fix_alignment.patch"
#  content [101a4d8c3d97cb09d2dd7737af4cf7fce15ea767]
# 
# add_file "packages/uclibc/uclibc-nptl/uClibc.distro"
#  content [c21a277aac0650ca6c77cd0851d7e2be0165c376]
# 
# add_file "packages/uclibc/uclibc-nptl/uClibc.machine.armv5te"
#  content [55b4a5c7c3dcf81fc96e330e74fc84374f0bc276]
# 
# add_file "packages/uclibc/uclibc-svn/arm_fix_alignment.patch"
#  content [101a4d8c3d97cb09d2dd7737af4cf7fce15ea767]
# 
# add_file "packages/uclibc/uclibc_nptl.bb"
#  content [4999fa82e8cb40cbff3508bf2427ca942ce9fc73]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [647a26cd30973ca6a2a668fa840c7bff50c53ae3]
#    to [1d1167f51c5546bba85239ea51b825be54cde78c]
# 
# patch "packages/gcc/gcc-4.2.4.inc"
#  from [c19d6f421c89aafcc3831e5693496a19b54c1669]
#    to [a9018fb5647464a2eddd44e1894c1d9e5eff68fa]
# 
# patch "packages/gcc/gcc-4.3.1/100-uclibc-conf.patch"
#  from [7864e7e76567d72bd6339ccea248ae75c24a6074]
#    to [21ec782ec4cb87ec7e391c7a878ea133b25f48d8]
# 
# patch "packages/gcc/gcc-4.3.1/200-uclibc-locale.patch"
#  from [28c039b24a03a717740c6985e40b5ea01e869378]
#    to [759565fa86b80e47e509cda3dfa36b4097e9e866]
# 
# patch "packages/gcc/gcc-4.3.1/203-uclibc-locale-no__x.patch"
#  from [64a0003447e854b6c8205b5b87d3cdc8ca7caa1d]
#    to [5ee89d22b24f940e26f40e812103487f78bef992]
# 
# patch "packages/gcc/gcc-4.3.1/205-uclibc-locale-update.patch"
#  from [129ab676c2787de37f94bf3c802616e8b21b7ab9]
#    to [aa30251c0c03c583f18bb28ab47c472352a29420]
# 
# patch "packages/gcc/gcc-4.3.1/302-c99-snprintf.patch"
#  from [5837922659dae60d1753d6257befc3472b9180df]
#    to [ac00d75b46057b7fec17aaacad6b582c3339c45a]
# 
# patch "packages/gcc/gcc-4.3.1/307-locale_facets.patch"
#  from [5dd86533b193ad688496b19e73f8e0395bb18761]
#    to [0110e9263c7a54d3bbc8b68339b338687b2262d1]
# 
# patch "packages/gcc/gcc-4.3.1/cache-amnesia.patch"
#  from [fc92668ad7f244bd08aa8c42ed9453ec619aa35c]
#    to [f48d39ae8b68dd9745effe9975b0e874f25e9e92]
# 
# patch "packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch"
#  from [2cbc3b136ee24e92a85a74d95f62c6efd87f7591]
#    to [54476decfdfe84996cd127331065e40ee27c9d07]
# 
# patch "packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch"
#  from [82a2c416b670506138070ddc8a4b94929373b031]
#    to [d272cd6c310740732e6e6ac35c9e5cffa5b82cce]
# 
# patch "packages/gcc/gcc-4.3.1.inc"
#  from [7ee3a1d24f6fe58cc59653a6e65c7e8bcc68a8a7]
#    to [63e353bf383d5eaf37da5f0b8b487f1f5470fd0a]
# 
# patch "packages/gcc/gcc-configure-common.inc"
#  from [25915b9362f47697289ee2936469e63ae7ce9ebe]
#    to [6a009baf06cdeed62d1ae068c65ac8646be509f9]
# 
# patch "packages/gcc/gcc-cross-sdk_4.2.4.bb"
#  from [e2a276b361c10c453d83333227c0367a9226dd42]
#    to [d5d2104cedde09409e61acdcb9d621c9fc792712]
# 
# patch "packages/gcc/gcc-cross-sdk_4.3.1.bb"
#  from [3cb7d1947efad651a0ff5bae8955a0ee1fd54a15]
#    to [798f187c94aeb2906e721710f0ca25d578302c7c]
# 
# patch "packages/gcc/gcc-cross_4.3.1.bb"
#  from [e090b234e1631af4203640b957526e50464e6b31]
#    to [cca304cc4b891b5f453c4e45ddd0c4161400c4a0]
# 
# patch "packages/gcc/gcc_4.3.1.bb"
#  from [3b72d4bc757dfb4722711cce0268d025768b1278]
#    to [e5bbb814e8bb53d3b9f131e07f7f2773ad205ef1]
# 
# patch "packages/mozilla/firefox-3.0.1/mozconfig"
#  from [2704adff3ffa3175691de0aa03a89add1e4c3169]
#    to [f51e160c952ebde87e47f50d75f425843dff2e27]
# 
# patch "packages/mozilla/firefox.inc"
#  from [fcf882c98cb2ecfebe08686ffb477faf55261957]
#    to [19236ab5b587efdf0d2e74dee775ec90c0ddbe88]
# 
# patch "packages/mozilla/firefox_3.0.1.bb"
#  from [5747a684fd3be549857c7c0f811a2ac8ccd81027]
#    to [61bf44cf9add45dd7cbe1746f5f55c153b427d47]
# 
# patch "packages/mythtv/gmyth-upnp_0.7.0.bb"
#  from [4667af3879b4e91ebc27b0ecf26ebfe32d999a2d]
#    to [8b75bcd164ea2941db3ae19b4f30ab821fa36300]
# 
# patch "packages/portaudio/portaudio-v19_svn.bb"
#  from [2412bb2e306a60afa27283238b90b401ca15749c]
#    to [560fcf8f87dfc060e6d95a1477f95dfe6864ada3]
# 
# patch "packages/sugar/sugar-base_0.82.0.bb"
#  from [222d6d3f00da874f79551cb34f5c1303ca257ed0]
#    to [cbfe5bb7096952d90c4998d19566e160f5d230b2]
# 
# patch "packages/sugar/sugar-toolkit_0.82.1.bb"
#  from [26cbe65d86d7a8971743b26419af876eafaea7ef]
#    to [77b79d5412c3229763f934d7818ca6b0a44ea317]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [968c9b16cfd524a38a3a8060e3d1ee79f68bac95]
#    to [f11e545cc7b002fc5a19f572b7fa7ed6551e81e3]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [e35f597e006a79e860bcfcbc82d23c9b7dabf317]
#    to [8b02df79e5136a8b2833ea26f26f95484bc814ec]
# 
# patch "packages/uclibc/uclibc_svn.bb"
#  from [88b7021e9c8e55186b7a8a8fe49a21da5aa94bac]
#    to [eaf1abec09168bb845c5cc7719513cfa957f0072]
#
============================================================
--- packages/python/python-numpy_1.1.1.bb	94d5ee7200a201465655e3946ebf7b020628cd9b
+++ packages/python/python-numpy_1.1.1.bb	94d5ee7200a201465655e3946ebf7b020628cd9b
@@ -0,0 +1,16 @@
+DESCRIPTION = "A sophisticated Numeric Processing Package for Python"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "PSF"
+PR = "ml0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \
+          "
+S = "${WORKDIR}/numpy-${PV}"
+
+inherit distutils
+
+do_stage() {
+	cp -pPR Include/Num* ${STAGING_INCDIR}
+}
+
============================================================
--- packages/uclibc/uclibc-0.9.29/uclibc-use-fgnu89-inline.patch	5dfb9586fa43464af763ff774e15dc0418a181de
+++ packages/uclibc/uclibc-0.9.29/uclibc-use-fgnu89-inline.patch	5dfb9586fa43464af763ff774e15dc0418a181de
@@ -0,0 +1,34 @@
+Source: http://www.nabble.com/-PATCH--uclibc-extern-inline-td14223616.html
+
+Description:
+
+Needed for uclibc-0.9.29 to compile with gcc 4.3.1
+
+You get this error without
+
+libc/libc_so.a(libc_pthread_init.oS): In function `testandset':
+libc_pthread_init.c:(.text+0x0): multiple definition of `testandset'
+libc/libc_so.a(forward.oS):forward.c:(.text+0x0): first defined here
+libc/libc_so.a(rpc_thread.oS): In function `testandset':
+rpc_thread.c:(.text+0x0): multiple definition of `testandset'
+libc/libc_so.a(forward.oS):forward.c:(.text+0x0): first defined here
+make[1]: *** [lib/libc.so] Error 1
+make: *** [lib/libc.so.0] Error 2
+
+
+---
+ Rules.mak |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: uClibc-0.9.29/Rules.mak
+===================================================================
+--- uClibc-0.9.29.orig/Rules.mak	2008-08-19 13:43:56.000000000 -0700
++++ uClibc-0.9.29/Rules.mak	2008-08-19 13:45:04.000000000 -0700
+@@ -402,6 +402,7 @@ CFLAGS += -DSTATIC
+ endif
+ 
+ CFLAGS += $(call check_gcc,-std=gnu99,)
++CFLAGS += $(call check_gcc,-fgnu89-inline,)
+ 
+ LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
+ # binutils-2.16.1 warns about ignored sections, 2.16.91.0.3 and newer are ok
============================================================
--- packages/uclibc/uclibc-initial_nptl.bb	6872f3dbf713d969e837fff3267dfe6c79cc7aa2
+++ packages/uclibc/uclibc-initial_nptl.bb	6872f3dbf713d969e837fff3267dfe6c79cc7aa2
@@ -0,0 +1,35 @@
+SECTION = "base"
+require uclibc_nptl.bb
+
+DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+PACKAGES = ""
+
+do_stage() {
+	# Install initial headers into the cross dir
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		install_headers V=1
+
+	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
+
+	# This conflicts with the c++ version of this header
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		lib/crt1.o lib/crti.o lib/crtn.o V=1
+
+	rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
+
+	install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
+
+	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
+}
+
+do_install() {
+	:
+}
+
+do_compile () {
+	:
+}
============================================================
--- packages/uclibc/uclibc-nptl/arm_fix_alignment.patch	101a4d8c3d97cb09d2dd7737af4cf7fce15ea767
+++ packages/uclibc/uclibc-nptl/arm_fix_alignment.patch	101a4d8c3d97cb09d2dd7737af4cf7fce15ea767
@@ -0,0 +1,19 @@
+ARMV5 can use STRD and LDRD access instructions but these accesses need to be 
+8 byte aligned. The dynamic linker's malloc needs to match this so structures
+become 8 byte aligned to void unaligned accesses.
+
+RP - 14/02/2008
+
+Index: uClibc-nptl/ldso/ldso/arm/dl-sysdep.h
+===================================================================
+--- uClibc-nptl.orig/ldso/ldso/arm/dl-sysdep.h	2008-08-08 16:52:28.000000000 -0700
++++ uClibc-nptl/ldso/ldso/arm/dl-sysdep.h	2008-08-08 23:51:39.000000000 -0700
+@@ -18,6 +18,8 @@
+   GOT_BASE[1] = (unsigned long) MODULE; \
+ }
+ 
++#define DL_MALLOC_ALIGN 8  /* EABI needs 8 byte alignment for STRD LDRD*/
++
+ static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p)
+ {
+ 	unsigned long i,t,inc;
============================================================
--- packages/uclibc/uclibc-nptl/uClibc.distro	c21a277aac0650ca6c77cd0851d7e2be0165c376
+++ packages/uclibc/uclibc-nptl/uClibc.distro	c21a277aac0650ca6c77cd0851d7e2be0165c376
@@ -0,0 +1,147 @@
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+# DOPIC is not set
+# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+UCLIBC_CTOR_DTOR=y
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+UCLIBC_HAS_THREADS_NATIVE=y
+# PTHREADS_DEBUG_SUPPORT is not set
+# LINUXTHREADS_OLD is not set
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Networking Support
+#
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+# UCLIBC_HAS_REENTRANT_RPC is not set
+# UCLIBC_USE_NETLINK is not set
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+UCLIBC_HAS_STDIO_BUFSIZ_256=y
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
+UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="/lib"
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="//usr"
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
+
+# math stuff for perl
+DO_C99_MATH=y
============================================================
--- packages/uclibc/uclibc-nptl/uClibc.machine.armv5te	55b4a5c7c3dcf81fc96e330e74fc84374f0bc276
+++ packages/uclibc/uclibc-nptl/uClibc.machine.armv5te	55b4a5c7c3dcf81fc96e330e74fc84374f0bc276
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
============================================================
--- packages/uclibc/uclibc-svn/arm_fix_alignment.patch	101a4d8c3d97cb09d2dd7737af4cf7fce15ea767
+++ packages/uclibc/uclibc-svn/arm_fix_alignment.patch	101a4d8c3d97cb09d2dd7737af4cf7fce15ea767
@@ -0,0 +1,19 @@
+ARMV5 can use STRD and LDRD access instructions but these accesses need to be 
+8 byte aligned. The dynamic linker's malloc needs to match this so structures
+become 8 byte aligned to void unaligned accesses.
+
+RP - 14/02/2008
+
+Index: uClibc-nptl/ldso/ldso/arm/dl-sysdep.h
+===================================================================
+--- uClibc-nptl.orig/ldso/ldso/arm/dl-sysdep.h	2008-08-08 16:52:28.000000000 -0700
++++ uClibc-nptl/ldso/ldso/arm/dl-sysdep.h	2008-08-08 23:51:39.000000000 -0700
+@@ -18,6 +18,8 @@
+   GOT_BASE[1] = (unsigned long) MODULE; \
+ }
+ 
++#define DL_MALLOC_ALIG%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r7fd15622321922163aab9fa955236c9a25de2e65 -rb5df7e6b304a3d45c76436fa5ba72556ffc23586
#
#
#
# patch "packages/dbus-java/dbus-java_2.5.bb"
#  from [086dc07a09255825ba9edd8b9bab5b2df169cc09]
#    to [9bbed2a9fcf70ddad94fdf80d17ee07775ea8619]
# 
# patch "packages/phoneme/phoneme-advanced.inc"
#  from [71f3ea62b1678f4a0865fd4d4927ee7d252ce7ac]
#    to [546e30038b8cd714ed6d1d4713bc79a64cf4ad0b]
#
============================================================
--- packages/dbus-java/dbus-java_2.5.bb	086dc07a09255825ba9edd8b9bab5b2df169cc09
+++ packages/dbus-java/dbus-java_2.5.bb	9bbed2a9fcf70ddad94fdf80d17ee07775ea8619
@@ -6,10 +6,10 @@ DEPENDS = "libmatthew docbook-utils-nati
 SECTION = "libs"
 LICENSE = "LGPLv2 AFL"
 DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
-RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
-RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
-RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
-PR = "r0"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java dbus-java-bin libmatthew-debug-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java"
+PR = "r1"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
 
@@ -53,11 +53,11 @@ do_install () {
 }
 
 do_install () {
-	oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar
-  oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar
-  oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar
+  oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar dbus.jar
+  oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar dbus-viewer.jar
+  oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar dbus-bin.jar
   
-	install -d ${D}${bindir}
+  install -d ${D}${bindir}
   install bin/DBusViewer ${D}${bindir}
   install bin/DBusCall ${D}${bindir}
   install bin/CreateInterface ${D}${bindir}
@@ -73,7 +73,7 @@ do_stage () {
 }
 
 do_stage () {
-	oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
+  oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
 }
 
 PACKAGE_ARCH = "all"
============================================================
--- packages/phoneme/phoneme-advanced.inc	71f3ea62b1678f4a0865fd4d4927ee7d252ce7ac
+++ packages/phoneme/phoneme-advanced.inc	546e30038b8cd714ed6d1d4713bc79a64cf4ad0b
@@ -65,7 +65,7 @@ do_configure() {
   pmo JAVAME_LEGAL_DIR ${WORKDIR}/legal
 
   pmo "# Java toolchain binaries"
-  pmo JDK_HOME $JAVA_HOME
+  pmo JDK_HOME /dev/null
   pmo CVM_TARGET_TOOLS_PREFIX ${CROSS_DIR}/bin/
   pmo CVM_JAVA java
   pmo CVM_JAVAC javac






More information about the Openembedded-commits mailing list