The lizard runs, but a lot of debugging is still needed.
This commit is contained in:
parent
741391fcd0
commit
7505eef175
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.25 2003/04/13 02:40:48 david Exp $
|
||||
# $OpenBSD: Makefile,v 1.26 2003/05/14 21:50:59 wilfried Exp $
|
||||
# Uses pthreads
|
||||
|
||||
COMMENT= "open source version of the Netscape browser"
|
||||
@ -8,7 +8,7 @@ DISTNAME= mozilla
|
||||
PKGNAME= mozilla-${VER}
|
||||
DISTFILES= mozilla-source-${VER}.tar.bz2
|
||||
|
||||
BROKEN= core dumps in dynamic library constructor
|
||||
BROKEN= More debugging needed
|
||||
|
||||
CATEGORIES= www
|
||||
|
||||
@ -38,6 +38,7 @@ CONFIGURE_ARGS= \
|
||||
--with-system-mng=${LOCALBASE} \
|
||||
--with-system-png=${LOCALBASE} \
|
||||
--with-system-zlib=/usr/lib \
|
||||
--disable-profilesharing \
|
||||
--disable-ldap
|
||||
# disable this for now
|
||||
# --enable-crypto \
|
||||
|
@ -1,6 +1,7 @@
|
||||
--- configure.in.orig Tue Jul 24 18:29:54 2001
|
||||
+++ configure.in Fri Aug 10 23:31:00 2001
|
||||
@@ -842,12 +842,11 @@
|
||||
$OpenBSD: patch-configure_in,v 1.3 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- configure.in.orig Sat May 10 20:39:08 2003
|
||||
+++ configure.in Mon May 12 09:40:07 2003
|
||||
@@ -1208,12 +1208,11 @@ case "$target" in
|
||||
DLL_SUFFIX=".so.1.0"
|
||||
DSO_CFLAGS=''
|
||||
DSO_PIC_CFLAGS='-fPIC'
|
||||
|
22
www/mozilla/patches/patch-nsprpub_config_OpenBSD_mk
Normal file
22
www/mozilla/patches/patch-nsprpub_config_OpenBSD_mk
Normal file
@ -0,0 +1,22 @@
|
||||
$OpenBSD: patch-nsprpub_config_OpenBSD_mk,v 1.1 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- nsprpub/config/OpenBSD.mk.orig Wed Jun 28 02:42:56 2000
|
||||
+++ nsprpub/config/OpenBSD.mk Thu May 8 23:38:27 2003
|
||||
@@ -62,17 +62,8 @@ ARCH = openbsd
|
||||
DLL_SUFFIX = so.1.0
|
||||
|
||||
DSO_CFLAGS = -fPIC
|
||||
-DSO_LDOPTS = -Bshareable
|
||||
-ifeq ($(OS_TEST),alpha)
|
||||
DSO_LDOPTS = -shared
|
||||
-endif
|
||||
-ifeq ($(OS_TEST),mips)
|
||||
-DSO_LDOPTS = -shared
|
||||
-endif
|
||||
-ifeq ($(OS_TEST),pmax)
|
||||
-DSO_LDOPTS = -shared
|
||||
-endif
|
||||
|
||||
-MKSHLIB = $(LD) $(DSO_LDOPTS)
|
||||
+MKSHLIB = $(CC) $(DSO_LDOPTS)
|
||||
|
||||
G++INCLUDES = -I/usr/include/g++
|
18
www/mozilla/patches/patch-nsprpub_configure
Normal file
18
www/mozilla/patches/patch-nsprpub_configure
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-nsprpub_configure,v 1.1 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- nsprpub/configure.orig Fri May 9 00:17:11 2003
|
||||
+++ nsprpub/configure Fri May 9 00:19:25 2003
|
||||
@@ -4130,12 +4130,8 @@ EOF
|
||||
MDCPUCFG_H=_openbsd.cfg
|
||||
PR_MD_CSRCS=openbsd.c
|
||||
USE_NSPR_THREADS=1
|
||||
- case "$OS_TEST" in
|
||||
- alpha|mips|pmax)
|
||||
- DSO_LDOPTS=-shared ;;
|
||||
- *)
|
||||
- DSO_LDOPTS=-Bshareable ;;
|
||||
- esac
|
||||
+ DSO_LDOPTS=-shared
|
||||
+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
|
||||
;;
|
||||
|
||||
*-openvms*)
|
18
www/mozilla/patches/patch-nsprpub_configure_in
Normal file
18
www/mozilla/patches/patch-nsprpub_configure_in
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-nsprpub_configure_in,v 1.1 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- nsprpub/configure.in.orig Thu May 8 23:59:47 2003
|
||||
+++ nsprpub/configure.in Fri May 9 00:02:46 2003
|
||||
@@ -1490,12 +1490,8 @@ mips-sony-newsos*)
|
||||
MDCPUCFG_H=_openbsd.cfg
|
||||
PR_MD_CSRCS=openbsd.c
|
||||
USE_NSPR_THREADS=1
|
||||
- case "$OS_TEST" in
|
||||
- alpha|mips|pmax)
|
||||
- DSO_LDOPTS=-shared ;;
|
||||
- *)
|
||||
- DSO_LDOPTS=-Bshareable ;;
|
||||
- esac
|
||||
+ DSO_LDOPTS=-shared
|
||||
+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
|
||||
;;
|
||||
|
||||
*-openvms*)
|
15
www/mozilla/patches/patch-nsprpub_pr_include_md__pth_h
Normal file
15
www/mozilla/patches/patch-nsprpub_pr_include_md__pth_h
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-nsprpub_pr_include_md__pth_h,v 1.1 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- nsprpub/pr/include/md/_pth.h.orig Tue Jan 7 08:29:57 2003
|
||||
+++ nsprpub/pr/include/md/_pth.h Tue May 13 15:16:30 2003
|
||||
@@ -248,7 +248,10 @@
|
||||
*/
|
||||
#define PT_PRIO_MIN 1
|
||||
#define PT_PRIO_MAX 127
|
||||
-#elif defined(NETBSD) || defined(OPENBSD) \
|
||||
+#elif defined(OPENBSD)
|
||||
+#define PT_PRIO_MIN 0
|
||||
+#define PT_PRIO_MAX 31
|
||||
+#elif defined(NETBSD) \
|
||||
|| defined(BSDI) || defined(DARWIN) || defined(UNIXWARE) /* XXX */
|
||||
#define PT_PRIO_MIN 0
|
||||
#define PT_PRIO_MAX 126
|
14
www/mozilla/patches/patch-nsprpub_pr_src_linking_prlink_c
Normal file
14
www/mozilla/patches/patch-nsprpub_pr_src_linking_prlink_c
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-nsprpub_pr_src_linking_prlink_c,v 1.1 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- nsprpub/pr/src/linking/prlink.c.orig Tue Mar 25 18:36:09 2003
|
||||
+++ nsprpub/pr/src/linking/prlink.c Wed May 14 00:01:41 2003
|
||||
@@ -162,8 +162,8 @@ struct _imcb *IAC$GL_IMAGE_LIST = NULL;
|
||||
* On these platforms, symbols have a leading '_'.
|
||||
*/
|
||||
#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
|
||||
- || defined(OPENBSD) || defined(WIN16) \
|
||||
- || (defined(NETBSD) && !defined(__ELF__))
|
||||
+ || defined(WIN16) \
|
||||
+ || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
|
||||
#define NEED_LEADING_UNDERSCORE
|
||||
#endif
|
||||
|
12
www/mozilla/patches/patch-nsprpub_pr_src_malloc_prmalloc_c
Normal file
12
www/mozilla/patches/patch-nsprpub_pr_src_malloc_prmalloc_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-nsprpub_pr_src_malloc_prmalloc_c,v 1.1 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- nsprpub/pr/src/malloc/prmalloc.c.orig Wed May 14 10:04:33 2003
|
||||
+++ nsprpub/pr/src/malloc/prmalloc.c Wed May 14 12:52:18 2003
|
||||
@@ -39,7 +39,7 @@
|
||||
** nspr20 user level threads. When we're debugging, we can make our
|
||||
** version of malloc fail occasionally.
|
||||
*/
|
||||
-#ifdef _PR_OVERRIDE_MALLOC
|
||||
+#if 0 && defined(_PR_OVERRIDE_MALLOC)
|
||||
|
||||
/*
|
||||
** Thread safe version of malloc, calloc, realloc, free
|
12
www/mozilla/patches/patch-nsprpub_pr_src_malloc_prmem_c
Normal file
12
www/mozilla/patches/patch-nsprpub_pr_src_malloc_prmem_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-nsprpub_pr_src_malloc_prmem_c,v 1.1 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- nsprpub/pr/src/malloc/prmem.c.orig Wed May 14 10:04:40 2003
|
||||
+++ nsprpub/pr/src/malloc/prmem.c Wed May 14 12:52:28 2003
|
||||
@@ -524,7 +524,7 @@
|
||||
** locking. This makes malloc somewhat faster so maybe it's a good thing
|
||||
** anyway.
|
||||
*/
|
||||
-#ifdef _PR_OVERRIDE_MALLOC
|
||||
+#if 0 && defined(_PR_OVERRIDE_MALLOC)
|
||||
|
||||
/* Imports */
|
||||
extern void *_PR_UnlockedMalloc(size_t size);
|
12
www/mozilla/patches/patch-nsprpub_pr_src_misc_prinit_c
Normal file
12
www/mozilla/patches/patch-nsprpub_pr_src_misc_prinit_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-nsprpub_pr_src_misc_prinit_c,v 1.1 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- nsprpub/pr/src/misc/prinit.c.orig Wed May 14 10:04:47 2003
|
||||
+++ nsprpub/pr/src/misc/prinit.c Wed May 14 12:52:59 2003
|
||||
@@ -227,7 +227,7 @@
|
||||
* XXX: call _PR_InitMem only on those platforms for which nspr implements
|
||||
* malloc, for now.
|
||||
*/
|
||||
-#ifdef _PR_OVERRIDE_MALLOC
|
||||
+#if 0 && defined(_PR_OVERRIDE_MALLOC)
|
||||
_PR_InitMem();
|
||||
#endif
|
||||
|
48
www/mozilla/patches/patch-string_embed_nsEmbedString_cpp
Normal file
48
www/mozilla/patches/patch-string_embed_nsEmbedString_cpp
Normal file
@ -0,0 +1,48 @@
|
||||
$OpenBSD: patch-string_embed_nsEmbedString_cpp,v 1.1 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- string/embed/nsEmbedString.cpp.orig Mon Mar 24 23:46:49 2003
|
||||
+++ string/embed/nsEmbedString.cpp Wed May 14 10:52:02 2003
|
||||
@@ -39,7 +39,7 @@
|
||||
#include <stdlib.h>
|
||||
#include "nsEmbedString.h"
|
||||
|
||||
-const PRUnichar gCommonEmptyBuffer[1] = { 0 };
|
||||
+static const PRUnichar gCommonEmptyBuffer[1] = { 0 };
|
||||
|
||||
nsEmbedString::nsEmbedString()
|
||||
{
|
||||
@@ -130,7 +130,7 @@ nsEmbedString::Realloc(size_type aNewSiz
|
||||
PRBool
|
||||
nsEmbedString::OwnsBuffer() const
|
||||
{
|
||||
- return mStr != (char_type*)gCommonEmptyBuffer;
|
||||
+ return mStr != (char_type*)gCommonEmptyBuffer && mCapacity != 0;
|
||||
}
|
||||
|
||||
const nsEmbedString::char_type*
|
||||
@@ -180,7 +180,7 @@ nsEmbedString::SetLength(size_type aLeng
|
||||
GrowCapacity(aLength);
|
||||
|
||||
mLength = aLength;
|
||||
- if (mStr != (char_type*)gCommonEmptyBuffer)
|
||||
+ if (mStr != (char_type*)gCommonEmptyBuffer && mCapacity != 0)
|
||||
AddNullTerminator();
|
||||
}
|
||||
|
||||
@@ -336,7 +336,7 @@ nsEmbedCString::Realloc(size_type aNewSi
|
||||
PRBool
|
||||
nsEmbedCString::OwnsBuffer() const
|
||||
{
|
||||
- return mStr != (char_type*)gCommonEmptyBuffer;
|
||||
+ return mStr != (char_type*)gCommonEmptyBuffer && mCapacity != 0;
|
||||
}
|
||||
|
||||
const nsEmbedCString::char_type*
|
||||
@@ -386,7 +386,7 @@ nsEmbedCString::SetLength(size_type aLen
|
||||
GrowCapacity(aLength);
|
||||
|
||||
mLength = aLength;
|
||||
- if (mStr != (char_type*)gCommonEmptyBuffer)
|
||||
+ if (mStr != (char_type*)gCommonEmptyBuffer && mCapacity != 0)
|
||||
AddNullTerminator();
|
||||
}
|
||||
|
12
www/mozilla/patches/patch-xpcom_glue_nsIGenericFactory_h
Normal file
12
www/mozilla/patches/patch-xpcom_glue_nsIGenericFactory_h
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-xpcom_glue_nsIGenericFactory_h,v 1.1 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- xpcom/glue/nsIGenericFactory.h.orig Sat May 10 21:22:54 2003
|
||||
+++ xpcom/glue/nsIGenericFactory.h Wed May 14 00:46:21 2003
|
||||
@@ -347,7 +347,7 @@
|
||||
NS_IMPL_NSGETMODULE_WITH_CTOR_DTOR(_name, _components, nsnull, _dtor)
|
||||
|
||||
#define NS_IMPL_NSGETMODULE_WITH_CTOR_DTOR(_name, _components, _ctor, _dtor) \
|
||||
-nsModuleInfo NSMODULEINFO(_name) = { \
|
||||
+static nsModuleInfo NSMODULEINFO(_name) = { \
|
||||
NS_MODULEINFO_VERSION, \
|
||||
(#_name), \
|
||||
(_components), \
|
12
www/mozilla/patches/patch-xpcom_sample_Makefile_in
Normal file
12
www/mozilla/patches/patch-xpcom_sample_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-xpcom_sample_Makefile_in,v 1.1 2003/05/14 21:50:59 wilfried Exp $
|
||||
--- xpcom/sample/Makefile.in.orig Mon May 12 12:39:00 2003
|
||||
+++ xpcom/sample/Makefile.in Mon May 12 12:38:41 2003
|
||||
@@ -54,7 +54,7 @@ XPIDLSRCS = nsISample.idl
|
||||
|
||||
TESTCPPSRCS = nsTestSample.cpp
|
||||
|
||||
-CPPSRCS += $(TESTCPPSRCS)
|
||||
+#CPPSRCS += $(TESTCPPSRCS)
|
||||
|
||||
SIMPLE_PROGRAMS = $(TESTCPPSRCS:.cpp=$(BIN_SUFFIX))
|
||||
|
Loading…
Reference in New Issue
Block a user