[oe-commits] org.oe.dev merge of '02ce8fba2c16b03770277a744efebc4f9c0f7f47'
xora commit
oe at amethyst.openembedded.net
Mon Jun 16 14:27:56 UTC 2008
merge of '02ce8fba2c16b03770277a744efebc4f9c0f7f47'
and '1ca4c522d6f876b0f973239befedba5f6ad6ab07'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 5f8c61f539e6f103dcfa53a341944eb1b46c96fe
ViewMTN: http://monotone.openembedded.org/revision/info/5f8c61f539e6f103dcfa53a341944eb1b46c96fe
Files:
1
classes/insane.bbclass
conf/machine/hx4700.conf
packages/meta/slugos-packages.bb
packages/pulseaudio/pulseaudio-alsa-wrapper.bb
packages/mozilla/firefox-2.0.0.14+3.0rc1
packages/mozilla/firefox-2.0.0.14+3.0rc1/010_FPU_IS_ARM_FPA_xslt.diff
packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug339782.additional.fix.diff
packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug385583.nspr.jmp_buf.eabi.diff
packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug405992.atomic.nspr.diff
packages/mozilla/firefox-2.0.0.14+3.0rc1/jsautocfg-dontoverwrite.patch
packages/mozilla/firefox-2.0.0.14+3.0rc1/linkage-problem.patch
packages/mozilla/firefox-2.0.0.14+3.0rc1/mozconfig
packages/mozilla/firefox-2.0.0.14+3.0rc1/random_to_urandom.diff
packages/mozilla/firefox-2.0.0.14+3.0rc1/security-cross.patch
packages/mozilla/firefox_2.0.0.14+3.0rc1.bb
Diffs:
#
# mt diff -r02ce8fba2c16b03770277a744efebc4f9c0f7f47 -r5f8c61f539e6f103dcfa53a341944eb1b46c96fe
#
#
#
# patch "classes/insane.bbclass"
# from [071cc4297bda486033be0ee2ba642fda644a63e8]
# to [bff5115ab0019254ae563d3c8698dbf67bb256f4]
#
# patch "conf/machine/hx4700.conf"
# from [537fcae072d2c76e87e7f1e735e333ccae1bb34a]
# to [6c63f74c98cc02dd49fcfc70e3cc0a45316fc6ce]
#
# patch "packages/meta/slugos-packages.bb"
# from [2c34d64cdbfeb122ef6edf82310d98f276055c93]
# to [8f81515c5aaa1108e646cbe57f516ab69335d272]
#
# patch "packages/pulseaudio/pulseaudio-alsa-wrapper.bb"
# from [3aecd5acd439510c0a240e80a452390e88c5dc1b]
# to [a18ced602465ff6a83679b36cd30cca49cfa1ad3]
#
============================================================
--- classes/insane.bbclass 071cc4297bda486033be0ee2ba642fda644a63e8
+++ classes/insane.bbclass bff5115ab0019254ae563d3c8698dbf67bb256f4
@@ -72,6 +72,9 @@ def package_qa_get_machine_dict():
"arm" : (40, 0, 0, True, True),
"armeb" : (40, 0, 0, False, True),
},
+ "linux-gnuspe" : {
+ "powerpc": (20, 0, 0, False, True),
+ },
}
============================================================
--- conf/machine/hx4700.conf 537fcae072d2c76e87e7f1e735e333ccae1bb34a
+++ conf/machine/hx4700.conf 6c63f74c98cc02dd49fcfc70e3cc0a45316fc6ce
@@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt "
+IMAGE_FSTYPES += "jffs2"
+
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
require conf/machine/include/tune-xscale.inc
============================================================
--- packages/meta/slugos-packages.bb 2c34d64cdbfeb122ef6edf82310d98f276055c93
+++ packages/meta/slugos-packages.bb 8f81515c5aaa1108e646cbe57f516ab69335d272
@@ -188,7 +188,6 @@ SLUGOS_PACKAGES = "\
pkgconfig \
popt \
portmap \
- postfix \
ppp \
procps \
psmisc \
@@ -244,7 +243,6 @@ SLUGOS_PACKAGES = "\
wview-vpro \
wview-wxt510 \
xinetd \
- yeaphone \
yp-tools ypbind ypserv \
zd1211-firmware \
zip \
@@ -263,6 +261,7 @@ SLUGOS_BROKEN_PACKAGES = "\
madfu \
motion \
openldap \
+ postfix \
pwc \
qc-usb-messenger \
spandsp \
@@ -270,6 +269,7 @@ SLUGOS_BROKEN_PACKAGES = "\
task-native-sdk \
unionfs-modules unionfs-utils \
wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
+ yeaphone \
zd1211 \
"
============================================================
--- packages/pulseaudio/pulseaudio-alsa-wrapper.bb 3aecd5acd439510c0a240e80a452390e88c5dc1b
+++ packages/pulseaudio/pulseaudio-alsa-wrapper.bb a18ced602465ff6a83679b36cd30cca49cfa1ad3
@@ -1,6 +1,8 @@ LICENSE = "GPLv2"
DESCRIPTION = "Meta package to make alsa transparently use pulseaudio"
LICENSE = "GPLv2"
+PR = "r1"
+
SRC_URI = "file://asound.conf.pulseaudio"
RDEPENDS = "hal \
@@ -9,6 +11,10 @@ RDEPENDS = "hal \
pulseaudio-module-alsa-sink \
pulseaudio-module-alsa-source \
pulseaudio-module-hal-detect \
+ pulseaudio-module-volume-restore \
+ pulseaudio-module-default-device-restore \
+ pulseaudio-module-rescue-streams \
+ pulseaudio-module-suspend-on-idle \
libasound-module-ctl-pulse \
libasound-module-pcm-pulse \
"
#
# mt diff -r1ca4c522d6f876b0f973239befedba5f6ad6ab07 -r5f8c61f539e6f103dcfa53a341944eb1b46c96fe
#
#
#
# add_dir "packages/mozilla/firefox-2.0.0.14+3.0rc1"
#
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/010_FPU_IS_ARM_FPA_xslt.diff"
# content [ca66de6dd5f344c90faf7a1045dba40a983a484b]
#
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug339782.additional.fix.diff"
# content [75dfa1a3d08f6cb2e15700e545c4de3241749310]
#
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug385583.nspr.jmp_buf.eabi.diff"
# content [d02e7df78e1b867a86ee7c2216154e23d8dbe579]
#
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug405992.atomic.nspr.diff"
# content [2c3592d765ce9d739279c8a09dcd572114bc9a1a]
#
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/jsautocfg-dontoverwrite.patch"
# content [8f2732cf8a7aff7b068849db230a84c7aba2cd44]
#
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/linkage-problem.patch"
# content [7863efd4c4cce2aacd3fca003a8f96089e3189bf]
#
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/mozconfig"
# content [f83ff32cfbbf829044318c7e97590355bcb0c2f5]
#
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/random_to_urandom.diff"
# content [f6efa175fe403ea2a5973cb6b7eccee9457d63b2]
#
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/security-cross.patch"
# content [d414420652c62ebdb6b1d7c5967ad1366aa98d84]
#
# add_file "packages/mozilla/firefox_2.0.0.14+3.0rc1.bb"
# content [bf62db140979e7b94274730d22fe8418c70f6c11]
#
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/010_FPU_IS_ARM_FPA_xslt.diff ca66de6dd5f344c90faf7a1045dba40a983a484b
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/010_FPU_IS_ARM_FPA_xslt.diff ca66de6dd5f344c90faf7a1045dba40a983a484b
@@ -0,0 +1,56 @@
+# Bug 369722 â prdtoa.c jsnum.h txDouble.h not required IEEE_ARM define on Codesourcery EABI gcc3.4.4 compiler
+#
+--- mozilla/content/xslt/public/txDouble.h.orig 2006-07-13 17:21:52.000000000 +0300
++++ mozilla/content/xslt/public/txDouble.h 2007-10-25 15:01:25.000000000 +0300
+@@ -58,46 +58,48 @@ fp_except_t oldmask = fpsetmask(~allmask
+ /**
+ * Stefan Hanske <sh990154 at mail.uni-greifswald.de> reports:
+ * ARM is a little endian architecture but 64 bit double words are stored
+ * differently: the 32 bit words are in little endian byte order, the two words
+ * are stored in big endian`s way.
+ */
+
+ #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
+-#define CPU_IS_ARM
++#if !defined(__VFP_FP__)
++#define FPU_IS_ARM_FPA
++#endif
+ #endif
+
+ #if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
+ /**
+ * This version of the macros is safe for the alias optimizations
+ * that gcc does, but uses gcc-specific extensions.
+ */
+
+ typedef union txdpun {
+ PRFloat64 d;
+ struct {
+-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
+ PRUint32 lo, hi;
+ #else
+ PRUint32 hi, lo;
+ #endif
+ } s;
+ } txdpun;
+
+ #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; }))
+ #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; }))
+
+ #else // __GNUC__
+
+ /* We don't know of any non-gcc compilers that perform alias optimization,
+ * so this code should work.
+ */
+
+-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
+ #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[1])
+ #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[0])
+ #else
+ #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[0])
+ #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[1])
+ #endif
+
+ #endif // __GNUC__
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug339782.additional.fix.diff 75dfa1a3d08f6cb2e15700e545c4de3241749310
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug339782.additional.fix.diff 75dfa1a3d08f6cb2e15700e545c4de3241749310
@@ -0,0 +1,39 @@
+# XPTC_InvokeByIndex crashes
+# Bug 339782 [ARM] XPTC_InvokeByIndex crashes when cross-compiled under GCC 3.4.x with EABI (CodeSourcery)
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+===================================================================
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+@@ -51,22 +51,32 @@
+ #ifdef __ARM_EABI__
+ #define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8))
+ #define VAR_STACK_SIZE_64 3
+ #else
+ #define DOUBLEWORD_ALIGN(p) (p)
+ #define VAR_STACK_SIZE_64 2
+ #endif
+
++#ifdef __ARM_EABI__
++#define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8))
++#else
++#define DOUBLEWORD_ALIGN(p) (p)
++#endif
++
+ // Remember that these 'words' are 32bit DWORDS
+
+ static PRUint32
+ invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
+ {
+ PRUint32 result = 0;
++
++ /* Note that we give a "worst case" estimate of how much stack _might_ be
++ * needed, rather than the real count - this should be safe */
++
+ for(PRUint32 i = 0; i < paramCount; i++, s++)
+ {
+ if(s->IsPtrData())
+ {
+ result++;
+ continue;
+ }
+ switch(s->type)
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug385583.nspr.jmp_buf.eabi.diff d02e7df78e1b867a86ee7c2216154e23d8dbe579
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug385583.nspr.jmp_buf.eabi.diff d02e7df78e1b867a86ee7c2216154e23d8dbe579
@@ -0,0 +1,33 @@
+diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h
+--- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-11-28 14:16:03.000000000 -0500
++++ mozilla/nsprpub/pr/include/md/_linux.h 2007-11-28 14:12:09.000000000 -0500
+@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void);
+ #error "Linux/MIPS pre-glibc2 not supported yet"
+ #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+
+-#elif defined(__arm__)
+-/* ARM/Linux */
++#elif defined(__arm__) && !defined(__ARM_EABI__)
++/* ARM/Linux (old-ABI) */
+ #if defined(__GLIBC__) && __GLIBC__ >= 2
+ #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20]
+ #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val))
+@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void);
+ #error "ARM/Linux pre-glibc2 not supported yet"
+ #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+
++#elif defined(__arm__) && defined(__ARM_EABI__)
++/* ARM/Linux (EABI) */
++#if defined(__GLIBC__) && __GLIBC__ >= 2
++#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8]
++#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val))
++#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
++#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7])
++#define _MD_SP_TYPE __ptr_t
++#else
++#error "ARM/Linux pre-glibc2 not supported yet"
++#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
++
+ #else
+
+ #error "Unknown CPU architecture"
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug405992.atomic.nspr.diff 2c3592d765ce9d739279c8a09dcd572114bc9a1a
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug405992.atomic.nspr.diff 2c3592d765ce9d739279c8a09dcd572114bc9a1a
@@ -0,0 +1,48 @@
+# Add atomic operations for ARM.
+diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h
+index 5b794c5..cb8d58e 100644
+--- a/nsprpub/pr/include/md/_linux.h
++++ b/nsprpub/pr/include/md/_linux.h
+@@ -194,6 +194,42 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
+ })
+ #endif
+
++#if defined(__arm__)
++#define _PR_HAVE_ATOMIC_OPS
++#define _MD_INIT_ATOMIC()
++
++typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
++#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *)0xffff0fc0)
++
++#define _MD_ATOMIC_INCREMENT(ptr) _MD_ATOMIC_ADD(ptr, 1)
++#define _MD_ATOMIC_DECREMENT(ptr) _MD_ATOMIC_ADD(ptr, -1)
++#define _MD_ATOMIC_ADD(ptr, n) \
++ ({ \
++ PRInt32 ov, nv; \
++ volatile PRInt32 *vp = (ptr); \
++ \
++ do { \
++ ov = *vp; \
++ nv = ov + (n); \
++ } \
++ while (__kernel_cmpxchg(ov, nv, vp)); \
++ \
++ nv; \
++ })
++#define _MD_ATOMIC_SET(ptr, nv) \
++ ({ \
++ PRInt32 ov; \
++ volatile PRInt32 *vp = (ptr); \
++ \
++ do { \
++ ov = *vp; \
++ } \
++ while (__kernel_cmpxchg(ov, (nv), vp)); \
++ \
++ ov; \
++ })
++#endif
++
+ #define USE_SETJMP
+ #if defined(__GLIBC__) && __GLIBC__ >= 2
+ #define _PR_POLL_AVAILABLE
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/jsautocfg-dontoverwrite.patch 8f2732cf8a7aff7b068849db230a84c7aba2cd44
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/jsautocfg-dontoverwrite.patch 8f2732cf8a7aff7b068849db230a84c7aba2cd44
@@ -0,0 +1,23 @@
+--- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000
++++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000
+@@ -319,20 +319,8 @@
+
+ jsopcode.h jsopcode.c: jsopcode.tbl
+
+-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
+ jsautocfg.h:
+ touch $@
+-else
+-ifeq ($(OS_ARCH),WINCE)
+-jsautocfg.h:
+- touch $@
+-else
+-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
+- @rm -f $@ jsautocfg.tmp
+- ./jscpucfg > jsautocfg.tmp
+- mv jsautocfg.tmp $@
+-endif
+-endif
+
+ # jscpucfg is a strange target
+ # Needs to be built with the host compiler but needs to include
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/linkage-problem.patch 7863efd4c4cce2aacd3fca003a8f96089e3189bf
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/linkage-problem.patch 7863efd4c4cce2aacd3fca003a8f96089e3189bf
@@ -0,0 +1,14 @@
+--- mozilla/layout/build/Makefile.in~ 2007-11-24 00:38:14.000000000 -0200
++++ mozilla/layout/build/Makefile.in 2007-11-24 00:38:14.000000000 -0200
+@@ -229,6 +229,11 @@
+ $(NULL)
+ endif
+
++ifdef MOZ_ENABLE_XFT
++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \
++ $(NULL)
++endif
++
+ ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
+ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
+ $(NULL)
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/mozconfig f83ff32cfbbf829044318c7e97590355bcb0c2f5
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/mozconfig f83ff32cfbbf829044318c7e97590355bcb0c2f5
@@ -0,0 +1,61 @@
+. $topsrcdir/browser/config/mozconfig
+
+# use GTK+-2 widget set with XFT font rendering
+#ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+
+# enable minimal profile support
+ac_add_options --disable-profilesharing
+ac_add_options --disable-profilelocking
+ac_add_options --enable-single-profile
+
+ac_add_options --with-system-zlib
+ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+
+ac_add_options --disable-accessibility
+ac_add_options --disable-composer
+#ac_add_options --enable-plaintext-editor-only
+ac_add_options --disable-mailnews
+ac_add_options --disable-ldap
+#ac_add_options --disable-postscript
+ac_add_options --disable-mathml
+ac_add_options --disable-jsd
+ac_add_options --disable-installer
+ac_add_options --disable-xprint
+ac_add_options --disable-necko-disk-cache
+
+# configure necko to allocate smaller network buffers
+ac_add_options --enable-necko-small-buffers
+
+# disable debug logging and tests
+#ac_add_options --disable-dtd-debug
+ac_add_options --disable-logging
+ac_add_options --enable-debug=-ggdb
+ac_add_options --disable-gtktest
+ac_add_options --disable-tests
+ac_add_options --disable-printing
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+
+# build crypto module (PSM + NSS)
+ac_add_options --enable-crypto
+
+# build minimal set of protocol handlers
+ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource
+
+# build minimal set of image decoders
+ac_add_options --enable-image-decoders=png,gif,jpeg
+
+#ac_add_options --enable-reorder
+#ac_add_options --enable-elf-dynstr-gc
+
+# enable static build
+#ac_add_options --disable-shared
+#ac_add_options --enable-static
+ac_add_options --enable-optimize=-O1
+
+# Use cairo from system
+ac_add_options --enable-system-cairo
+
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/random_to_urandom.diff f6efa175fe403ea2a5973cb6b7eccee9457d63b2
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/random_to_urandom.diff f6efa175fe403ea2a5973cb6b7eccee9457d63b2
@@ -0,0 +1,26 @@
+# Component manager should not use /dev/random for generation ranodm numbers
+# It cause hangs on embedding platforms,which does not have enough devices for generation required entropy
+# Bug somewhere exists but it is very old
+Index: nsprpub/pr/src/md/unix/uxrng.c
+===================================================================
+--- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig
++++ mozilla/nsprpub/pr/src/md/unix/uxrng.c
+@@ -144,17 +144,17 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+
+ static int fdDevRandom;
+ static PRCallOnceType coOpenDevRandom;
+
+ static PRStatus OpenDevRandom( void )
+ {
+- fdDevRandom = open( "/dev/random", O_RDONLY );
++ fdDevRandom = open( "/dev/urandom", O_RDONLY );
+ return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS );
+ } /* end OpenDevRandom() */
+
+ static size_t GetDevRandom( void *buf, size_t size )
+ {
+ int bytesIn;
+ int rc;
+
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/security-cross.patch d414420652c62ebdb6b1d7c5967ad1366aa98d84
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/security-cross.patch d414420652c62ebdb6b1d7c5967ad1366aa98d84
@@ -0,0 +1,93 @@
+--- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000
++++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000
+@@ -52,88 +52,8 @@
+
+ DEFAULT_COMPILER = gcc
+
+-ifeq ($(OS_TEST),m68k)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = m68k
+-else
+-ifeq ($(OS_TEST),ppc64)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = ppc
+-ifeq ($(USE_64),1)
+- ARCHFLAG = -m64
+-endif
+-else
+-ifeq ($(OS_TEST),ppc)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = ppc
+-else
+-ifeq ($(OS_TEST),alpha)
+- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = alpha
+-else
+-ifeq ($(OS_TEST),ia64)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = ia64
+-else
+-ifeq ($(OS_TEST),x86_64)
+-ifeq ($(USE_64),1)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = x86_64
+-else
+- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
+- CPU_ARCH = x86
+- ARCHFLAG = -m32
+-endif
+-else
+-ifeq ($(OS_TEST),sparc)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = sparc
+-else
+-ifeq ($(OS_TEST),sparc64)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = sparc
+-else
+-ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = arm
+-else
+-ifeq ($(OS_TEST),parisc)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = hppa
+-else
+-ifeq ($(OS_TEST),parisc64)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = hppa
+-else
+-ifeq ($(OS_TEST),s390)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = s390
+-else
+-ifeq ($(OS_TEST),s390x)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = s390x
+-else
+-ifeq ($(OS_TEST),mips)
+- OS_REL_CFLAGS = -DLINU%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list