[oe-commits] org.oe.dev firefox: fix firefox 2.0.0.3 building - close #3372
otavio commit
openembedded-commits at lists.openembedded.org
Wed Dec 5 18:05:46 UTC 2007
firefox: fix firefox 2.0.0.3 building - close #3372
Author: otavio at ossystems.com.br
Branch: org.openembedded.dev
Revision: 1a6625be75631d7dfb75413cb256eef5afb4d507
ViewMTN: http://monotone.openembedded.org/revision/info/1a6625be75631d7dfb75413cb256eef5afb4d507
Files:
1
packages/mozilla/mozilla
packages/mozilla/mozilla/files
packages/mozilla/mozilla/files/i386
packages/mozilla/mozilla/files/i486
packages/mozilla/mozilla/files/i586
packages/mozilla/mozilla/files/i686
packages/mozilla/mozilla/firefox-2.0.0.3
packages/mozilla/mozilla/files/i386/jsautocfg.h
packages/mozilla/mozilla/files/i486/jsautocfg.h
packages/mozilla/mozilla/files/i586/jsautocfg.h
packages/mozilla/mozilla/files/i686/jsautocfg.h
packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch
packages/mozilla/firefox-2.0.0.3/mozconfig
packages/mozilla/firefox_2.0.0.3.bb
Diffs:
#
# mt diff -r29075b7c071cc7557d3ea569204000183c04ce58 -r1a6625be75631d7dfb75413cb256eef5afb4d507
#
#
#
# add_dir "packages/mozilla/mozilla"
#
# add_dir "packages/mozilla/mozilla/files"
#
# add_dir "packages/mozilla/mozilla/files/i386"
#
# add_dir "packages/mozilla/mozilla/files/i486"
#
# add_dir "packages/mozilla/mozilla/files/i586"
#
# add_dir "packages/mozilla/mozilla/files/i686"
#
# add_dir "packages/mozilla/mozilla/firefox-2.0.0.3"
#
# add_file "packages/mozilla/mozilla/files/i386/jsautocfg.h"
# content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
#
# add_file "packages/mozilla/mozilla/files/i486/jsautocfg.h"
# content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
#
# add_file "packages/mozilla/mozilla/files/i586/jsautocfg.h"
# content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
#
# add_file "packages/mozilla/mozilla/files/i686/jsautocfg.h"
# content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
#
# add_file "packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch"
# content [7863efd4c4cce2aacd3fca003a8f96089e3189bf]
#
# patch "packages/mozilla/firefox-2.0.0.3/mozconfig"
# from [035d9834d662d15a37cc3f7aa65c0111e433b3b9]
# to [411dfae58ddc1627c6aa7e0ae66592e8a6d27877]
#
# patch "packages/mozilla/firefox_2.0.0.3.bb"
# from [ff9dc115db7d1ddc78b700764d392c5d86f63481]
# to [08d4f61dc91156c06adfd55995d6aca49f5c95ba]
#
============================================================
--- packages/mozilla/mozilla/files/i386/jsautocfg.h 0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
+++ packages/mozilla/mozilla/files/i386/jsautocfg.h 0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE 1L
+#define JS_BYTES_PER_SHORT 2L
+#define JS_BYTES_PER_INT 4L
+#define JS_BYTES_PER_INT64 8L
+#define JS_BYTES_PER_LONG 4L
+#define JS_BYTES_PER_FLOAT 4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD 4L
+#define JS_BYTES_PER_DWORD 8L
+
+#define JS_BITS_PER_BYTE 8L
+#define JS_BITS_PER_SHORT 16L
+#define JS_BITS_PER_INT 32L
+#define JS_BITS_PER_INT64 64L
+#define JS_BITS_PER_LONG 32L
+#define JS_BITS_PER_FLOAT 32L
+#define JS_BITS_PER_DOUBLE 64L
+#define JS_BITS_PER_WORD 32L
+
+#define JS_BITS_PER_BYTE_LOG2 3L
+#define JS_BITS_PER_SHORT_LOG2 4L
+#define JS_BITS_PER_INT_LOG2 5L
+#define JS_BITS_PER_INT64_LOG2 6L
+#define JS_BITS_PER_LONG_LOG2 5L
+#define JS_BITS_PER_FLOAT_LOG2 5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2 5L
+
+#define JS_ALIGN_OF_SHORT 2L
+#define JS_ALIGN_OF_INT 4L
+#define JS_ALIGN_OF_LONG 4L
+#define JS_ALIGN_OF_INT64 8L
+#define JS_ALIGN_OF_FLOAT 4L
+#define JS_ALIGN_OF_DOUBLE 8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD 4L
+
+#define JS_BYTES_PER_WORD_LOG2 2L
+#define JS_BYTES_PER_DWORD_LOG2 3L
+#define JS_WORDS_PER_DWORD_LOG2 1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
============================================================
--- packages/mozilla/mozilla/files/i486/jsautocfg.h 0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
+++ packages/mozilla/mozilla/files/i486/jsautocfg.h 0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE 1L
+#define JS_BYTES_PER_SHORT 2L
+#define JS_BYTES_PER_INT 4L
+#define JS_BYTES_PER_INT64 8L
+#define JS_BYTES_PER_LONG 4L
+#define JS_BYTES_PER_FLOAT 4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD 4L
+#define JS_BYTES_PER_DWORD 8L
+
+#define JS_BITS_PER_BYTE 8L
+#define JS_BITS_PER_SHORT 16L
+#define JS_BITS_PER_INT 32L
+#define JS_BITS_PER_INT64 64L
+#define JS_BITS_PER_LONG 32L
+#define JS_BITS_PER_FLOAT 32L
+#define JS_BITS_PER_DOUBLE 64L
+#define JS_BITS_PER_WORD 32L
+
+#define JS_BITS_PER_BYTE_LOG2 3L
+#define JS_BITS_PER_SHORT_LOG2 4L
+#define JS_BITS_PER_INT_LOG2 5L
+#define JS_BITS_PER_INT64_LOG2 6L
+#define JS_BITS_PER_LONG_LOG2 5L
+#define JS_BITS_PER_FLOAT_LOG2 5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2 5L
+
+#define JS_ALIGN_OF_SHORT 2L
+#define JS_ALIGN_OF_INT 4L
+#define JS_ALIGN_OF_LONG 4L
+#define JS_ALIGN_OF_INT64 8L
+#define JS_ALIGN_OF_FLOAT 4L
+#define JS_ALIGN_OF_DOUBLE 8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD 4L
+
+#define JS_BYTES_PER_WORD_LOG2 2L
+#define JS_BYTES_PER_DWORD_LOG2 3L
+#define JS_WORDS_PER_DWORD_LOG2 1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
============================================================
--- packages/mozilla/mozilla/files/i586/jsautocfg.h 0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
+++ packages/mozilla/mozilla/files/i586/jsautocfg.h 0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE 1L
+#define JS_BYTES_PER_SHORT 2L
+#define JS_BYTES_PER_INT 4L
+#define JS_BYTES_PER_INT64 8L
+#define JS_BYTES_PER_LONG 4L
+#define JS_BYTES_PER_FLOAT 4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD 4L
+#define JS_BYTES_PER_DWORD 8L
+
+#define JS_BITS_PER_BYTE 8L
+#define JS_BITS_PER_SHORT 16L
+#define JS_BITS_PER_INT 32L
+#define JS_BITS_PER_INT64 64L
+#define JS_BITS_PER_LONG 32L
+#define JS_BITS_PER_FLOAT 32L
+#define JS_BITS_PER_DOUBLE 64L
+#define JS_BITS_PER_WORD 32L
+
+#define JS_BITS_PER_BYTE_LOG2 3L
+#define JS_BITS_PER_SHORT_LOG2 4L
+#define JS_BITS_PER_INT_LOG2 5L
+#define JS_BITS_PER_INT64_LOG2 6L
+#define JS_BITS_PER_LONG_LOG2 5L
+#define JS_BITS_PER_FLOAT_LOG2 5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2 5L
+
+#define JS_ALIGN_OF_SHORT 2L
+#define JS_ALIGN_OF_INT 4L
+#define JS_ALIGN_OF_LONG 4L
+#define JS_ALIGN_OF_INT64 8L
+#define JS_ALIGN_OF_FLOAT 4L
+#define JS_ALIGN_OF_DOUBLE 8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD 4L
+
+#define JS_BYTES_PER_WORD_LOG2 2L
+#define JS_BYTES_PER_DWORD_LOG2 3L
+#define JS_WORDS_PER_DWORD_LOG2 1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
============================================================
--- packages/mozilla/mozilla/files/i686/jsautocfg.h 0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
+++ packages/mozilla/mozilla/files/i686/jsautocfg.h 0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE 1L
+#define JS_BYTES_PER_SHORT 2L
+#define JS_BYTES_PER_INT 4L
+#define JS_BYTES_PER_INT64 8L
+#define JS_BYTES_PER_LONG 4L
+#define JS_BYTES_PER_FLOAT 4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD 4L
+#define JS_BYTES_PER_DWORD 8L
+
+#define JS_BITS_PER_BYTE 8L
+#define JS_BITS_PER_SHORT 16L
+#define JS_BITS_PER_INT 32L
+#define JS_BITS_PER_INT64 64L
+#define JS_BITS_PER_LONG 32L
+#define JS_BITS_PER_FLOAT 32L
+#define JS_BITS_PER_DOUBLE 64L
+#define JS_BITS_PER_WORD 32L
+
+#define JS_BITS_PER_BYTE_LOG2 3L
+#define JS_BITS_PER_SHORT_LOG2 4L
+#define JS_BITS_PER_INT_LOG2 5L
+#define JS_BITS_PER_INT64_LOG2 6L
+#define JS_BITS_PER_LONG_LOG2 5L
+#define JS_BITS_PER_FLOAT_LOG2 5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2 5L
+
+#define JS_ALIGN_OF_SHORT 2L
+#define JS_ALIGN_OF_INT 4L
+#define JS_ALIGN_OF_LONG 4L
+#define JS_ALIGN_OF_INT64 8L
+#define JS_ALIGN_OF_FLOAT 4L
+#define JS_ALIGN_OF_DOUBLE 8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD 4L
+
+#define JS_BYTES_PER_WORD_LOG2 2L
+#define JS_BYTES_PER_DWORD_LOG2 3L
+#define JS_WORDS_PER_DWORD_LOG2 1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
============================================================
--- packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch 7863efd4c4cce2aacd3fca003a8f96089e3189bf
+++ packages/mozilla/mozilla/firefox-2.0.0.3/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.3/mozconfig 035d9834d662d15a37cc3f7aa65c0111e433b3b9
+++ packages/mozilla/firefox-2.0.0.3/mozconfig 411dfae58ddc1627c6aa7e0ae66592e8a6d27877
@@ -55,3 +55,6 @@ ac_add_options --enable-optimize=-O1
#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.3.bb ff9dc115db7d1ddc78b700764d392c5d86f63481
+++ packages/mozilla/firefox_2.0.0.3.bb 08d4f61dc91156c06adfd55995d6aca49f5c95ba
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
file://xptcstubs.patch;patch=1 \
file://no-xmb.patch;patch=1 \
@@ -10,7 +10,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mo
file://eabi-fix.patch;patch=1 \
file://eabi-fix2.patch;patch=1 \
file://eabi-fix3.patch;patch=1 \
+ file://linkage-problem.patch;patch=1 \
"
+DEPENDS += cairo
+
S = "${WORKDIR}/mozilla"
DEFAULT_PREFERENCE = "-1"
@@ -36,4 +39,3 @@ do_stage() {
# removes 2 lines that call absent headers
sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h
}
-
More information about the Openembedded-commits
mailing list