minimo: added 0.016 version with EABI patches - works in qemuarm

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1622 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2007-05-09 10:39:10 +00:00
parent 79efb6c8b3
commit ff0fe2be89
10 changed files with 943 additions and 118 deletions

View File

@@ -0,0 +1,66 @@
http://lists.debian.org/debian-arm/2007/05/msg00039.html
From: Lennert Buytenhek <buytenh@wantstofly.org>
Hi,
The reason that building nss (i.e., firefox) would segfault on ARM EABI
systems is an assumption about the layout of the jmp_buf structure in
the nspr library (which nss depends on) that does hold on old-ABI but
no longer holds on EABI. The attached patch fixes this assumption,
and fixes the shlibsign segfault during the building of nss (it also
fixes a floating point byte order assumption.)
Looks sane?
It's of course a stupid idea to depend on a particular layout of the
jmp_buf structure in application programs, but oh well. People write
ugly buggy code, film at 11.
--- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig 2007-05-06 02:39:00.000000000 +0200
+++ mozilla/nsprpub/pr/src/misc/prdtoa.c 2007-05-06 02:39:22.000000000 +0200
@@ -59,8 +59,8 @@
/* FIXME: deal with freelist and p5s. */
}
-#if defined(__arm) || defined(__arm__) || defined(__arm26__) \
- || defined(__arm32__)
+#if (defined(__arm) || defined(__arm__) || defined(__arm26__) \
+ || defined(__arm32__)) && !defined(__ARM_EABI__) && !defined(__ARMEB__)
#define IEEE_ARM
#elif defined(IS_LITTLE_ENDIAN)
#define IEEE_8087
--- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-05-06 02:39:45.000000000 +0200
+++ mozilla/nsprpub/pr/include/md/_linux.h 2007-05-06 02:40:57.000000000 +0200
@@ -346,7 +346,7 @@
#error "Linux/MIPS pre-glibc2 not supported yet"
#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
-#elif defined(__arm__)
+#elif defined(__arm__) && !defined(__ARM_EABI__)
/* ARM/Linux */
#if defined(__GLIBC__) && __GLIBC__ >= 2
#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20]
@@ -358,6 +358,18 @@
#error "ARM/Linux pre-glibc2 not supported yet"
#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+#elif defined(__arm__) && defined(__ARM_EABI__)
+/* ARM/Linux */
+#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"

View File

@@ -0,0 +1,56 @@
https://bugzilla.mozilla.org/show_bug.cgi?id=369722
Index: js/src/jsnum.h
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsnum.h,v
retrieving revision 3.27
diff -p -u -8 -r3.27 jsnum.h
--- mozilla/js/src/jsnum.h 21 Dec 2006 01:00:32 -0000 3.27
+++ mozilla/js/src/jsnum.h 8 Feb 2007 12:13:01 -0000
@@ -52,23 +52,24 @@ JS_BEGIN_EXTERN_C
/*
* Stefan Hanske <sh990154@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(__ARM_EABI__) && \
+ (defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__))
+#define IEEE_ARM
#endif
typedef union jsdpun {
struct {
-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
+#if defined(IS_LITTLE_ENDIAN) && !defined(IEEE_ARM)
uint32 lo, hi;
#else
uint32 hi, lo;
#endif
} s;
jsdouble d;
} jsdpun;
@@ -87,17 +88,17 @@ typedef union jsdpun {
#else /* not or old 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(IEEE_ARM)
#define JSDOUBLE_HI32(x) (((uint32 *)&(x))[1])
#define JSDOUBLE_LO32(x) (((uint32 *)&(x))[0])
#else
#define JSDOUBLE_HI32(x) (((uint32 *)&(x))[0])
#define JSDOUBLE_LO32(x) (((uint32 *)&(x))[1])
#endif
#define JSDOUBLE_SET_HI32(x, y) (JSDOUBLE_HI32(x)=(y))

View File

@@ -0,0 +1,15 @@
From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
Index: mozilla/extensions/transformiix/source/base/Double.cpp
===================================================================
--- mozilla.orig/extensions/transformiix/source/base/Double.cpp 2007-05-09 11:21:34.000000000 +0200
+++ mozilla/extensions/transformiix/source/base/Double.cpp 2007-05-09 11:23:59.000000000 +0200
@@ -71,7 +71,7 @@
* are stored in big endian`s way.
*/
-#if defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
+#if !defined(__ARM_EABI__) && defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
#define CPU_IS_ARM
#endif

View File

@@ -0,0 +1,13 @@
See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.org/show_bug.cgi?id=1600
--- /tmp/xptcinvoke_arm.cpp 2006-12-10 20:02:57.000000000 +0100
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp 2006-12-10 20:03:54.592227000 +0100
@@ -212,7 +212,7 @@
"add sp, sp, r4 \n\t" /* restore stack pointer */
"mov %0, r0 \n\t" /* the result... */
: "=r" (result)
- : "r" (&my_params)
+ : "r" (&my_params), "m" (my_params)
: "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp"
);

View File

@@ -1,62 +1,56 @@
Index: mozilla/nsprpub/config/rules.mk
===================================================================
--- mozilla.orig/nsprpub/config/rules.mk 2005-01-04 21:27:36.000000000 +0000
+++ mozilla/nsprpub/config/rules.mk 2005-09-30 11:27:33.000000000 +0000
@@ -87,6 +87,9 @@
CCC=$(HOST_CXX)
diff -Naur mozilla_old/configure mozilla/configure
--- mozilla_old/configure 2006-06-03 23:44:17.000000000 +0300
+++ mozilla/configure 2006-06-07 00:16:15.000000000 +0300
@@ -18755,11 +18755,18 @@
if test -n "$CROSS_COMPILE"; then
if test -z "$HOST_LIBIDL_CONFIG"; then
+ echo "HOST_LIBIDL_CONFIG not defined"
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
fi
- if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
+ if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no" && test -n "$HOST_PKG_CONFIG_PATH"; then
+ echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH"
+ _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+ PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH
HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+ echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
+ echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS"
+ PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH
else
HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
diff -Naur mozilla_old/configure.in mozilla/configure.in
--- mozilla_old/configure.in 2006-06-03 23:35:20.000000000 +0300
+++ mozilla/configure.in 2006-06-07 00:10:26.000000000 +0300
@@ -6870,12 +6870,17 @@
if test -n "$CROSS_COMPILE"; then
if test -z "$HOST_LIBIDL_CONFIG"; then
+ AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined])
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
fi
if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
+ AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host])
HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+ AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS])
HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
+ AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS])
else
+ AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS])
HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
fi
diff -Naur mozilla_old/nsprpub/config/rules.mk mozilla/nsprpub/config/rules.mk
--- mozilla_old/nsprpub/config/rules.mk 2006-02-22 04:33:33.000000000 +0200
+++ mozilla/nsprpub/config/rules.mk 2006-06-07 00:07:06.000000000 +0300
@@ -90,6 +90,8 @@
CFLAGS=$(HOST_CFLAGS)
CXXFLAGS=$(HOST_CXXFLAGS)
+LDFLAGS=$(HOST_LDFLAGS)
LDFLAGS=$(HOST_LDFLAGS)
+RANLIB=$(HOST_RANLIB)
+AR=$(HOST_AR)
endif
endif
endif
Index: mozilla/configure.in
===================================================================
--- mozilla.orig/configure.in 2005-03-30 17:57:38.000000000 +0000
+++ mozilla/configure.in 2005-09-30 11:36:44.000000000 +0000
@@ -5612,13 +5612,18 @@
fi
if test -n "$CROSS_COMPILE"; then
- if test -z "$HOST_LIBIDL_CONFIG"; then
+ if test -z "$HOST_LIBIDL_CONFIG"; then
+ AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined])
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
fi
if test -n "$HOST_LIBIDL_CONFIG"; then
+ AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host])
HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+ AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS])
HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
+ AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS])
else
+ AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS])
HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
fi
Index: mozilla/configure
===================================================================
--- mozilla.orig/configure 2005-03-30 17:58:47.000000000 +0000
+++ mozilla/configure 2005-09-30 11:38:36.000000000 +0000
@@ -16572,11 +16572,18 @@
if test -n "$CROSS_COMPILE"; then
if test -z "$HOST_LIBIDL_CONFIG"; then
+ echo "HOST_LIBIDL_CONFIG nto defined"
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
fi
- if test -n "$HOST_LIBIDL_CONFIG"; then
+ if test -n "$HOST_LIBIDL_CONFIG" && test -n "$HOST_PKG_CONFIG_PATH"; then
+ echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH"
+ _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+ PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH
HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+ echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
+ echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS"
+ PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH
else
HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS="$LIBIDL_LIBS"

View File

@@ -0,0 +1,4 @@
#!/bin/sh
export MOZILLA_FIVE_HOME=/usr/lib/mozilla-minimo
export LD_LIBRARY_PATH=${MOZILLA_FIVE_HOME}
exec ${MOZILLA_FIVE_HOME}/minimo "$@"

View File

@@ -0,0 +1,567 @@
Index: mozilla/content/html/content/src/nsFormSubmission.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/html/content/src/nsFormSubmission.cpp,v
retrieving revision 1.46
diff --context=3 -r1.46 nsFormSubmission.cpp
*** mozilla/content/html/content/src/nsFormSubmission.cpp 13 Jul 2005 16:55:59 -0000 1.46
--- mozilla/content/html/content/src/nsFormSubmission.cpp 21 Jul 2006 00:27:14 -0000
***************
*** 1315,1325 ****
nsresult rv = NS_OK;
nsCAutoString charset(aCharset);
- // canonical name is passed so that we just have to check against
- // *our* canonical names listed in charsetaliases.properties
- if (charset.EqualsLiteral("ISO-8859-1")) {
- charset.AssignLiteral("windows-1252");
- }
// use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
// MS IE/Opera).
--- 1315,1320 ----
Index: mozilla/embedding/base/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v
retrieving revision 1.34.8.2
diff --context=3 -r1.34.8.2 Makefile.in
*** mozilla/embedding/base/Makefile.in 14 Feb 2006 05:28:31 -0000 1.34.8.2
--- mozilla/embedding/base/Makefile.in 21 Jul 2006 00:27:14 -0000
***************
*** 43,48 ****
--- 43,49 ----
MODULE = embed_base
LIBRARY_NAME = embed_base_s
+ EXPORT_LIBRARY = 1
XPIDL_MODULE = embed_base
include $(DEPTH)/config/autoconf.mk
Index: mozilla/js/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/js/src/Makefile.in,v
retrieving revision 3.95.4.4
diff --context=3 -r3.95.4.4 Makefile.in
*** mozilla/js/src/Makefile.in 7 Jul 2006 02:12:02 -0000 3.95.4.4
--- mozilla/js/src/Makefile.in 21 Jul 2006 00:27:14 -0000
***************
*** 46,51 ****
--- 46,52 ----
MODULE = js
LIBRARY_NAME = mozjs
+ EXPORT_LIBRARY = 1
LIB_IS_C_ONLY = 1
GRE_MODULE = 1
Index: mozilla/minimo/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/minimo/Makefile.in,v
retrieving revision 1.1.2.2
diff --context=3 -r1.1.2.2 Makefile.in
*** mozilla/minimo/Makefile.in 29 Jun 2006 06:11:30 -0000 1.1.2.2
--- mozilla/minimo/Makefile.in 21 Jul 2006 00:27:14 -0000
***************
*** 41,46 ****
include $(DEPTH)/config/autoconf.mk
! DIRS = config components chrome locales customization base
include $(topsrcdir)/config/rules.mk
--- 41,46 ----
include $(DEPTH)/config/autoconf.mk
! DIRS = config chrome locales customization base
include $(topsrcdir)/config/rules.mk
Index: mozilla/minimo/base/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v
retrieving revision 1.3.2.7
diff --context=3 -r1.3.2.7 Makefile.in
*** mozilla/minimo/base/Makefile.in 18 Apr 2006 21:04:38 -0000 1.3.2.7
--- mozilla/minimo/base/Makefile.in 21 Jul 2006 00:27:14 -0000
***************
*** 95,101 ****
# this should move into the toolkit!
LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
- CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
ifdef WINCE
RCINCLUDE = wince/SplashScreen.rc
--- 95,100 ----
***************
*** 139,148 ****
endif
- FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
- FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
- FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
-
include $(topsrcdir)/config/static-config.mk
EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
--- 138,143 ----
***************
*** 176,189 ****
# (same as in mozilla/js/src/Makefile.in)
ifdef WINCE
LDFLAGS += -OPT:NOICF
endif
- export::
- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
-
-
- GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
ifdef WINCE
package::
--- 171,181 ----
# (same as in mozilla/js/src/Makefile.in)
ifdef WINCE
LDFLAGS += -OPT:NOICF
+ else
+ # Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
+ LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P
endif
ifdef WINCE
package::
Index: mozilla/minimo/base/Minimo.cpp
===================================================================
RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v
retrieving revision 1.1.2.11
diff --context=3 -r1.1.2.11 Minimo.cpp
*** mozilla/minimo/base/Minimo.cpp 11 Jul 2006 19:37:05 -0000 1.1.2.11
--- mozilla/minimo/base/Minimo.cpp 21 Jul 2006 00:27:15 -0000
***************
*** 781,789 ****
CreateListenerWindow();
#endif
! #ifdef MOZ_WIDGET_GTK2
gtk_set_locale();
gtk_init(&argc, &argv);
#endif
#ifdef HACKY_PRE_LOAD_LIBRARY
--- 781,794 ----
CreateListenerWindow();
#endif
! #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
! #if defined(MOZ_WIDGET_GTK)
gtk_set_locale();
+ #endif
gtk_init(&argc, &argv);
+
+ gtk_widget_set_default_visual(gdk_rgb_get_visual());
+ gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
#endif
#ifdef HACKY_PRE_LOAD_LIBRARY
Index: mozilla/minimo/base/SplashScreen.cpp
===================================================================
RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v
retrieving revision 1.1.2.3
diff --context=3 -r1.1.2.3 SplashScreen.cpp
*** mozilla/minimo/base/SplashScreen.cpp 11 Jul 2006 18:44:17 -0000 1.1.2.3
--- mozilla/minimo/base/SplashScreen.cpp 21 Jul 2006 00:27:15 -0000
***************
*** 180,188 ****
--- 180,203 ----
void KillSplashScreen() {}
void GetScreenSize(unsigned long* x, unsigned long* y)
{
+ #ifdef MOZ_WIDGET_GTK2
+ GdkDisplay* display = gdk_display_get_default();
+ if (display != NULL)
+ {
+ GdkScreen *screen;
+ screen = gdk_display_get_default_screen(display);
+ *x = gdk_screen_get_width(screen);
+ *y = gdk_screen_get_height(screen);
+ }
+ else
+ {
+ #endif
// we need to figure this out.
*x = 240;
*y = 320;
+ #ifdef MOZ_WIDGET_GTK2
+ }
+ #endif
}
Index: mozilla/minimo/chrome/content/minimo.js
===================================================================
RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v
retrieving revision 1.9.2.90
diff --context=3 -r1.9.2.90 minimo.js
*** mozilla/minimo/chrome/content/minimo.js 11 Jul 2006 19:37:04 -0000 1.9.2.90
--- mozilla/minimo/chrome/content/minimo.js 21 Jul 2006 00:27:16 -0000
***************
*** 1313,1319 ****
43 const FIND_LINKS = 2;
http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
*/
! gBrowser.fastFind.find(vQuery,0);
}
} catch (e) {
onErrorHandler(e);
--- 1313,1319 ----
43 const FIND_LINKS = 2;
http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
*/
! gBrowser.fastFind.find(vQuery,0,this.mHasFocus);
}
} catch (e) {
onErrorHandler(e);
***************
*** 1324,1330 ****
function DoBrowserFindNext() {
try {
! gBrowser.fastFind.findNext();
} catch (e) {
onErrorHandler(e);
}
--- 1324,1330 ----
function DoBrowserFindNext() {
try {
! gBrowser.fastFind.findNext(this.mHasFocus);
} catch (e) {
onErrorHandler(e);
}
Index: mozilla/minimo/config/linux_package.sh
===================================================================
RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v
retrieving revision 1.8.2.3
diff --context=3 -r1.8.2.3 linux_package.sh
*** mozilla/minimo/config/linux_package.sh 30 Jun 2006 16:35:19 -0000 1.8.2.3
--- mozilla/minimo/config/linux_package.sh 21 Jul 2006 00:27:16 -0000
***************
*** 29,37 ****
cp -pRL bin/libnssckbi.so minimo
cp -pRL bin/libsmime3.so minimo
cp -pRL bin/libsoftokn3.so minimo
- cp -pRL bin/libsoftokn3.chk minimo
cp -pRL bin/libfreebl3.so minimo
- cp -pRL bin/libfreebl3.chk minimo
cp -pRL bin/libssl3.so minimo
mkdir -p minimo/chrome
--- 29,35 ----
***************
*** 62,69 ****
cp -pRL bin/components/nsHelperAppDlg.js minimo/components
cp -pRL bin/components/nsProgressDialog.js minimo/components
- cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
-
mkdir -p minimo/greprefs
cp -pRL bin/greprefs/* minimo/greprefs
--- 60,65 ----
***************
*** 80,86 ****
echo Linking XPT files.
! bin/xpt_link minimo/components/all.xpt bin/components/*.xpt
echo Chewing on chrome
--- 76,82 ----
echo Linking XPT files.
! host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt
echo Chewing on chrome
Index: mozilla/profile/dirserviceprovider/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v
retrieving revision 1.7
diff --context=3 -r1.7 Makefile.in
*** mozilla/profile/dirserviceprovider/src/Makefile.in 6 Apr 2005 03:35:21 -0000 1.7
--- mozilla/profile/dirserviceprovider/src/Makefile.in 21 Jul 2006 00:27:16 -0000
***************
*** 44,49 ****
--- 44,50 ----
MODULE = profdirserviceprovider
LIBRARY_NAME = profdirserviceprovider_s
+ EXPORT_LIBRARY = 1
MOZILLA_INTERNAL_API = 1
REQUIRES = xpcom \
Index: mozilla/security/coreconf/Linux.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
retrieving revision 1.18.18.1
diff --context=3 -r1.18.18.1 Linux.mk
*** mozilla/security/coreconf/Linux.mk 3 Feb 2006 22:26:36 -0000 1.18.18.1
--- mozilla/security/coreconf/Linux.mk 21 Jul 2006 00:27:16 -0000
***************
*** 117,122 ****
--- 117,126 ----
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = mips
else
+ ifeq ($(OS_TEST),arm)
+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ CPU_ARCH = arm
+ else
OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
CPU_ARCH = x86
endif
***************
*** 133,138 ****
--- 137,143 ----
endif
endif
endif
+ endif
LIBC_TAG = _glibc
Index: mozilla/security/coreconf/arch.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v
retrieving revision 1.17.14.2
diff --context=3 -r1.17.14.2 arch.mk
*** mozilla/security/coreconf/arch.mk 3 Feb 2006 22:26:36 -0000 1.17.14.2
--- mozilla/security/coreconf/arch.mk 21 Jul 2006 00:27:16 -0000
***************
*** 60,77 ****
64BIT_TAG=
endif
! OS_ARCH := $(subst /,_,$(shell uname -s))
#
# Attempt to differentiate between sparc and x86 Solaris
#
! OS_TEST := $(shell uname -m)
! ifeq ($(OS_TEST),i86pc)
! OS_RELEASE := $(shell uname -r)_$(OS_TEST)
! else
! OS_RELEASE := $(shell uname -r)
! endif
#
# Force the IRIX64 machines to use IRIX.
--- 60,73 ----
64BIT_TAG=
endif
! OS_ARCH := Linux
#
# Attempt to differentiate between sparc and x86 Solaris
#
! OS_TEST := arm
! OS_RELEASE := 2.6
#
# Force the IRIX64 machines to use IRIX.
Index: mozilla/toolkit/components/build/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v
retrieving revision 1.24.2.10
diff --context=3 -r1.24.2.10 Makefile.in
*** mozilla/toolkit/components/build/Makefile.in 13 Jul 2006 20:08:29 -0000 1.24.2.10
--- mozilla/toolkit/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000
***************
*** 112,118 ****
$(NULL)
SHARED_LIBRARY_LIBS = \
- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
$(NULL)
ifdef MOZ_XPINSTALL
--- 112,117 ----
Index: mozilla/toolkit/components/startup/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v
retrieving revision 1.7
diff --context=3 -r1.7 Makefile.in
*** mozilla/toolkit/components/startup/src/Makefile.in 27 Jul 2005 20:42:44 -0000 1.7
--- mozilla/toolkit/components/startup/src/Makefile.in 21 Jul 2006 00:27:17 -0000
***************
*** 43,48 ****
--- 43,49 ----
MODULE = toolkitcomps
LIBRARY_NAME = appstartup_s
+ EXPORT_LIBRARY = 1
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
Index: mozilla/toolkit/xre/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v
retrieving revision 1.48.2.3
diff --context=3 -r1.48.2.3 Makefile.in
*** mozilla/toolkit/xre/Makefile.in 30 Sep 2005 19:52:44 -0000 1.48.2.3
--- mozilla/toolkit/xre/Makefile.in 21 Jul 2006 00:27:17 -0000
***************
*** 45,51 ****
MODULE = xulapp
LIBRARY_NAME = xulapp_s
- EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
REQUIRES = \
--- 45,50 ----
***************
*** 176,189 ****
include $(topsrcdir)/config/rules.mk
- ifdef BUILD_STATIC_LIBS
- export::
- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
- # embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to
- # FINAL_LINK_COMPS to keep the two lists in sync :-(
- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
- endif
-
LOCAL_INCLUDES += \
-I$(srcdir) \
-I$(topsrcdir)/xpfe/bootstrap \
--- 175,180 ----
Index: mozilla/xpcom/build/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v
retrieving revision 1.90.2.2
diff --context=3 -r1.90.2.2 Makefile.in
*** mozilla/xpcom/build/Makefile.in 29 Jan 2006 16:51:02 -0000 1.90.2.2
--- mozilla/xpcom/build/Makefile.in 21 Jul 2006 00:27:17 -0000
***************
*** 61,67 ****
endif
# Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
! #EXPORT_LIBRARY = 1
GRE_MODULE = 1
MOZILLA_INTERNAL_API = 1
--- 61,67 ----
endif
# Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
! EXPORT_LIBRARY = 1
GRE_MODULE = 1
MOZILLA_INTERNAL_API = 1
Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v
retrieving revision 1.7
diff --context=3 -r1.7 xptcstubs_arm.cpp
*** mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 18 Apr 2004 14:18:18 -0000 1.7
--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 21 Jul 2006 00:27:17 -0000
***************
*** 45,53 ****
#endif
/* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */
! static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
! static nsresult
PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
{
#define PARAM_BUFFER_COUNT 16
--- 45,53 ----
#endif
/* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */
! nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
! nsresult
PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
{
#define PARAM_BUFFER_COUNT 16
Index: mozilla/xpfe/browser/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v
retrieving revision 1.70
diff --context=3 -r1.70 Makefile.in
*** mozilla/xpfe/browser/src/Makefile.in 18 Mar 2005 21:23:45 -0000 1.70
--- mozilla/xpfe/browser/src/Makefile.in 21 Jul 2006 00:27:17 -0000
***************
*** 44,49 ****
--- 44,50 ----
MODULE = browser
LIBRARY_NAME = mozbrwsr_s
+ EXPORT_LIBRARY = 1
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
MODULE_NAME = nsBrowserModule
Index: mozilla/xpfe/components/build/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v
retrieving revision 1.69.8.1
diff --context=3 -r1.69.8.1 Makefile.in
*** mozilla/xpfe/components/build/Makefile.in 27 Sep 2005 00:15:25 -0000 1.69.8.1
--- mozilla/xpfe/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000
***************
*** 44,50 ****
MODULE = appcomps
LIBRARY_NAME = appcomps
- EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = application
LIBXUL_LIBRARY = 1
--- 44,49 ----
Index: mozilla/xpfe/components/filepicker/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v
retrieving revision 1.9.8.1
diff --context=3 -r1.9.8.1 Makefile.in
*** mozilla/xpfe/components/filepicker/src/Makefile.in 22 May 2006 16:29:32 -0000 1.9.8.1
--- mozilla/xpfe/components/filepicker/src/Makefile.in 21 Jul 2006 00:27:17 -0000
***************
*** 47,53 ****
MODULE = filepicker
LIBRARY_NAME = fileview
SHORT_LIBNAME = fileview
- EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsFileViewModule
MOZILLA_INTERNAL_API = 1
--- 47,52 ----
Index: mozilla/xpfe/components/find/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v
retrieving revision 1.37
diff --context=3 -r1.37 Makefile.in
*** mozilla/xpfe/components/find/src/Makefile.in 18 Mar 2005 21:23:46 -0000 1.37
--- mozilla/xpfe/components/find/src/Makefile.in 21 Jul 2006 00:27:17 -0000
***************
*** 45,51 ****
MODULE = appcomps
XPIDL_MODULE = mozfind
LIBRARY_NAME = mozfind
- EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsFindComponent
LIBXUL_LIBRARY = 1
--- 45,50 ----

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@@ -1,76 +1,36 @@
# build minimo
MINIMO=1
mk_add_options MINIMO=1
# mozilla/configure: Features and packages:
# enable building the browser
ac_add_options --enable-application=browser
# use GTK+-2 widget set with XFT font rendering
MOZ_ENABLE_COREXFONTS=0
mk_add_options MOZ_ENABLE_COREXFONTS=0
ac_add_options --enable-application=minimo
ac_add_options --enable-default-toolkit=gtk2
ac_add_options --enable-xft
ac_add_options --disable-freetype2
# disable XUL support to reduce codesize
ac_add_options --disable-xul
# enable minimal profile support
ac_add_options --disable-profilesharing
ac_add_options --disable-profilelocking
ac_add_options --enable-single-profile
# disable features and skip various build steps
ac_add_options --disable-extensions
ac_add_options --disable-accessibility
ac_add_options --disable-composer
ac_add_options --disable-extensions
ac_add_options --disable-installer
ac_add_options --disable-jsd
ac_add_options --disable-jsloader
ac_add_options --disable-ldap
ac_add_options --disable-mailnews
ac_add_options --disable-mathml
ac_add_options --disable-necko-disk-cache
ac_add_options --enable-xft
ac_add_options --disable-postscript
ac_add_options --disable-view-source
ac_add_options --disable-xpfe-components
ac_add_options --disable-xpinstall
ac_add_options --disable-xprint
ac_add_options --disable-gnomevfs
ac_add_options --disable-gnomeui
ac_add_options --disable-jsd
ac_add_options --disable-plugins
ac_add_options --disable-view-source
ac_add_options --disable-accessibility
ac_add_options --disable-xpinstall
ac_add_options --enable-single-profile
ac_add_options --disable-jsloader
ac_add_options --disable-printing
ac_add_options --enable-native-uconv
ac_add_options --enable-plaintext-editor-only
ac_add_options --disable-v1-string-abi
ac_add_options --disable-plugins
# 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 --disable-tests
# 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
# build minimal set of image decoders
ac_add_options --disable-xpcom-obsolete
ac_add_options --disable-pref-extensions
ac_add_options --disable-extensions
ac_add_options --enable-image-decoders=png,gif,jpeg
# code generation options (optimize for size)
ac_add_options --disable-mathml
ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-tests
ac_add_options --enable-optimize=-Os
ac_add_options --disable-logging
ac_add_options --enable-strip
ac_add_options --disable-debug
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
# remove link dependency on libstdc++.so
LIBS=-lsupc++
ac_add_options --disable-profilesharing
ac_add_options --disable-profilelocking

View File

@@ -0,0 +1,150 @@
DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices"
SECTION = "x11/network"
LICENSE = "MPL/GPL/LGPL"
HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
PRIORITY = "optional"
DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+"
CVSSVR="cvs-mirror.mozilla.org"
BRTAG = "MOZILLA_1_8_BRANCH"
MOZDATE = "20060720"
PV = "0.016+cvs${MOZDATE}"
PR = "r5"
SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
file://minimo.patch;patch=1 \
file://bug-322806.diff;patch=1 \
file://mozconfig file://minimo \
file://eabi-fix.patch;patch=1 \
file://eabi-fix2.patch;patch=1 \
file://eabi-fix3.patch;patch=1 \
file://minimo.desktop file://minimo.png"
inherit autotools
S = "${WORKDIR}/mozilla"
export MOZCONFIG = "${WORKDIR}/mozconfig"
export CROSS_COMPILE="1"
export ac_cv_prog_HOST_CC="${BUILD_CC}"
export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
mozdir="${libdir}/mozilla-minimo"
EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} "
do_configure() {
cd ${S}
oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk
}
do_compile() {
cd ${S}
oe_runmake -f client.mk build
}
do_install() {
cd ${WORKDIR}
install -d ${D}${bindir}
install -m 0755 minimo ${D}${bindir}
install -d ${D}${datadir}/applications
install -m 0644 minimo.desktop ${D}${datadir}/applications
install -d ${D}/${datadir}/pixmaps
install -m 0644 minimo.png ${D}${datadir}/pixmaps
cd ${S}
./minimo/config/linux_package.sh ${S} ${S}/minimo/config
cd dist/minimo
install -d ${D}${mozdir}
install -m 0755 minimo ${D}${mozdir}
install -m 0755 libfreebl3.so ${D}${mozdir}
install -m 0755 libnspr4.so ${D}${mozdir}
install -m 0755 libnss3.so ${D}${mozdir}
install -m 0755 libnssckbi.so ${D}${mozdir}
install -m 0755 libplc4.so ${D}${mozdir}
install -m 0755 libplds4.so ${D}${mozdir}
install -m 0755 libsmime3.so ${D}${mozdir}
install -m 0755 libsoftokn3.so ${D}${mozdir}
install -m 0755 libssl3.so ${D}${mozdir}
install -d ${D}${mozdir}/chrome
install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome
install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome
install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome
install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome
install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome
install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome
install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome
install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome
install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome
install -d ${D}${mozdir}/components
install -m 0644 components/all.xpt ${D}${mozdir}/components
install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components
install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components
install -d ${D}${mozdir}/greprefs
install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs
install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs
install -d ${D}${mozdir}/res
install -m 0644 res/forms.css ${D}${mozdir}/res
install -m 0644 res/html.css ${D}${mozdir}/res
install -m 0644 res/quirk.css ${D}${mozdir}/res
install -m 0644 res/ua.css ${D}${mozdir}/res
install -m 0644 res/arrow.gif ${D}${mozdir}/res
install -m 0644 res/arrowd.gif ${D}${mozdir}/res
install -m 0644 res/broken-image.gif ${D}${mozdir}/res
install -m 0644 res/loading-image.gif ${D}${mozdir}/res
install -m 0644 res/charsetData.properties ${D}${mozdir}/res
install -m 0644 res/charsetalias.properties ${D}${mozdir}/res
install -m 0644 res/langGroups.properties ${D}${mozdir}/res
install -m 0644 res/language.properties ${D}${mozdir}/res
install -m 0644 res/unixcharset.properties ${D}${mozdir}/res
install -d ${D}${mozdir}/res/dtd
install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd
install -d ${D}${mozdir}/res/entityTables
install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables
install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables
install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables
install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables
install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables
install -d ${D}${mozdir}/res/fonts
install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts
install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts
install -d ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html
install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html
}
FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*"
FILES_${PN} += "${mozdir}"